Changeset 151873 in webkit

Timestamp:

Jun 21, 2013 6:10:24 PM (11 years ago)

Author:

Simon Fraser

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/mac/ScrollingCoordinatorMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-21  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <bfulgham@apple.com>
 

trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm

@@ -443 +443 @@
     if (shouldUpdateScrollLayerPositionOnMainThread())
         indicatorMode = MainThreadScrollingBecauseOfStyleIndication;
-    else if (m_scrollingStateTree->rootStateNode()->wheelEventHandlerCount())
+    else if (m_scrollingStateTree->rootStateNode() && m_scrollingStateTree->rootStateNode()->wheelEventHandlerCount())
         indicatorMode =  MainThreadScrollingBecauseOfEventHandlersIndication;
     else