Title: [196379] branches/safari-601-branch/Source/WebCore
- Revision
- 196379
- Author
- matthew_han...@apple.com
- Date
- 2016-02-10 12:33:18 -0800 (Wed, 10 Feb 2016)
Log Message
Merge r196208. rdar://problem/24417430
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (196378 => 196379)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-10 20:33:15 UTC (rev 196378)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-10 20:33:18 UTC (rev 196379)
@@ -1,5 +1,23 @@
2016-02-10 Matthew Hanson <matthew_han...@apple.com>
+ Merge r196208. rdar://problem/24417430
+
+ 2016-02-05 Beth Dakin <bda...@apple.com>
+
+ ScrollbarPainters needs to be deallocated on the main thread
+ https://bugs.webkit.org/show_bug.cgi?id=153932
+ -and corresponding-
+ rdar://problem/24015483
+
+ Reviewed by Geoff Garen.
+
+ Follow-up fix since the first one was still race-y.
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::~ScrollingTreeFrameScrollingNodeMac):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren):
+
+2016-02-10 Matthew Hanson <matthew_han...@apple.com>
+
Merge r196206. rdar://problem/24417430
2016-02-05 Beth Dakin <bda...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (196378 => 196379)
--- branches/safari-601-branch/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-02-10 20:33:15 UTC (rev 196378)
+++ branches/safari-601-branch/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-02-10 20:33:18 UTC (rev 196379)
@@ -68,8 +68,8 @@
if (m_verticalScrollbarPainter || m_horizontalScrollbarPainter) {
// FIXME: This is a workaround in place for the time being since NSScrollerImps cannot be deallocated
// on a non-main thread. rdar://problem/24535055
- RetainPtr<ScrollbarPainter> retainedVerticalScrollbarPainter = m_verticalScrollbarPainter;
- RetainPtr<ScrollbarPainter> retainedHorizontalScrollbarPainter = m_horizontalScrollbarPainter;
+ RetainPtr<ScrollbarPainter> retainedVerticalScrollbarPainter = WTFMove(m_verticalScrollbarPainter);
+ RetainPtr<ScrollbarPainter> retainedHorizontalScrollbarPainter = WTFMove(m_horizontalScrollbarPainter);
WTF::callOnMainThread([retainedVerticalScrollbarPainter, retainedHorizontalScrollbarPainter] { });
}
}
@@ -116,8 +116,8 @@
{
// FIXME: This is a workaround in place for the time being since NSScrollerImps cannot be deallocated
// on a non-main thread. rdar://problem/24535055
- RetainPtr<ScrollbarPainter> retainedVerticalScrollbarPainter = m_verticalScrollbarPainter;
- RetainPtr<ScrollbarPainter> retainedHorizontalScrollbarPainter = m_horizontalScrollbarPainter;
+ RetainPtr<ScrollbarPainter> retainedVerticalScrollbarPainter = WTFMove(m_verticalScrollbarPainter);
+ RetainPtr<ScrollbarPainter> retainedHorizontalScrollbarPainter = WTFMove(m_horizontalScrollbarPainter);
WTF::callOnMainThread([retainedVerticalScrollbarPainter, retainedHorizontalScrollbarPainter]
{});
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
