Title: [158380] tags/Safari-538.4/Source/WebCore
- Revision
- 158380
- Author
- [email protected]
- Date
- 2013-10-31 12:08:30 -0700 (Thu, 31 Oct 2013)
Log Message
Merged r158375. <rdar://problem/15246606>
Modified Paths
Diff
Modified: tags/Safari-538.4/Source/WebCore/ChangeLog (158379 => 158380)
--- tags/Safari-538.4/Source/WebCore/ChangeLog 2013-10-31 18:47:00 UTC (rev 158379)
+++ tags/Safari-538.4/Source/WebCore/ChangeLog 2013-10-31 19:08:30 UTC (rev 158380)
@@ -1,3 +1,22 @@
+2013-10-31 Lucas Forschler <[email protected]>
+
+ Merge r158375
+
+ 2013-10-31 Beth Dakin <[email protected]>
+
+ Repro scrolling crash with scrollbars that use setPresentationValue on the
+ scrolling thread
+ https://bugs.webkit.org/show_bug.cgi?id=123549
+ -and corresponding-
+ <rdar://problem/15246606>
+
+ Reviewed by Darin Adler.
+
+ Speculative fix. I think if we retain the ScrollbarPainters, we should avoid this
+ crash.
+
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
+
2013-10-30 Alexey Proskuryakov <[email protected]>
85 inspector tests asserting in DrawingAreaProxyImpl::updateAcceleratedCompositingMode()
Modified: tags/Safari-538.4/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (158379 => 158380)
--- tags/Safari-538.4/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2013-10-31 18:47:00 UTC (rev 158379)
+++ tags/Safari-538.4/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2013-10-31 19:08:30 UTC (rev 158380)
@@ -85,8 +85,8 @@
RetainPtr<CALayer> m_counterScrollingLayer;
RetainPtr<CALayer> m_headerLayer;
RetainPtr<CALayer> m_footerLayer;
- ScrollbarPainter m_verticalScrollbarPainter;
- ScrollbarPainter m_horizontalScrollbarPainter;
+ RetainPtr<ScrollbarPainter> m_verticalScrollbarPainter;
+ RetainPtr<ScrollbarPainter> m_horizontalScrollbarPainter;
IntPoint m_probableMainThreadScrollPosition;
bool m_lastScrollHadUnfilledPixels;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
