Title: [151873] trunk/Source/WebCore
- Revision
- 151873
- Author
- [email protected]
- Date
- 2013-06-21 18:10:24 -0700 (Fri, 21 Jun 2013)
Log Message
Occasional crash swiping between pages
https://bugs.webkit.org/show_bug.cgi?id=117902
Reviewed by Beth Dakin.
m_scrollingStateTree->rootStateNode() can be null when quickly swiping between pages,
so check this in ScrollingCoordinatorMac::commitTreeState().
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::commitTreeState):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151872 => 151873)
--- trunk/Source/WebCore/ChangeLog 2013-06-22 00:25:55 UTC (rev 151872)
+++ trunk/Source/WebCore/ChangeLog 2013-06-22 01:10:24 UTC (rev 151873)
@@ -1,3 +1,16 @@
+2013-06-21 Simon Fraser <[email protected]>
+
+ Occasional crash swiping between pages
+ https://bugs.webkit.org/show_bug.cgi?id=117902
+
+ Reviewed by Beth Dakin.
+
+ m_scrollingStateTree->rootStateNode() can be null when quickly swiping between pages,
+ so check this in ScrollingCoordinatorMac::commitTreeState().
+
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::commitTreeState):
+
2013-06-21 Brent Fulgham <[email protected]>
AX: Title for ListItemRole should consist of concatenated child text elements.
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (151872 => 151873)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2013-06-22 00:25:55 UTC (rev 151872)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2013-06-22 01:10:24 UTC (rev 151873)
@@ -442,7 +442,7 @@
ScrollingModeIndication indicatorMode;
if (shouldUpdateScrollLayerPositionOnMainThread())
indicatorMode = MainThreadScrollingBecauseOfStyleIndication;
- else if (m_scrollingStateTree->rootStateNode()->wheelEventHandlerCount())
+ else if (m_scrollingStateTree->rootStateNode() && m_scrollingStateTree->rootStateNode()->wheelEventHandlerCount())
indicatorMode = MainThreadScrollingBecauseOfEventHandlersIndication;
else
indicatorMode = ThreadedScrollingIndication;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
