Changeset 168514 in webkit

Timestamp:

May 8, 2014 7:26:22 PM (10 years ago)

Author:

Simon Fraser

Message:

Occasional crash under AsyncScrollingCoordinator::frameViewRootLayerDidChange() on history navigation
​https://bugs.webkit.org/show_bug.cgi?id=132723

Reviewed by Sam Weinig.

Crash reports suggest that when we call AsyncScrollingCoordinator::frameViewRootLayerDidChange()
from HistoryController::restoreScrollPositionAndViewState(), the FrameView may not have a
scrolling node ID, which suggests that either the FrameView doesn't have a RenderView,
or compositing hasn't happened yet.

So if we enter AsyncScrollingCoordinator::frameViewRootLayerDidChange()
and the FrameView has no scrollLayerID, just return. We'll fix things up
when compositing kicks in later.

• page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/AsyncScrollingCoordinator.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Occasional crash under AsyncScrollingCoordinator::frameViewRootLayerDidChange() on history navigation
+        https://bugs.webkit.org/show_bug.cgi?id=132723
+
+        Reviewed by Sam Weinig.
+        
+        Crash reports suggest that when we call AsyncScrollingCoordinator::frameViewRootLayerDidChange()
+        from HistoryController::restoreScrollPositionAndViewState(), the FrameView may not have a 
+        scrolling node ID, which suggests that either the FrameView doesn't have a RenderView,
+        or compositing hasn't happened yet.
+        
+        So if we enter AsyncScrollingCoordinator::frameViewRootLayerDidChange()
+        and the FrameView has no scrollLayerID, just return. We'll fix things up
+        when compositing kicks in later.
+
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
+
 2014-05-08  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

@@ -120 +120 @@
     if (!coordinatesScrollingForFrameView(frameView))
         return;
-
+    
+    // FIXME: In some navigation scenarios, the FrameView has no RenderView or that RenderView has not been composited.
+    // This needs cleaning up: https://bugs.webkit.org/show_bug.cgi?id=132724
+    if (!frameView->scrollLayerID())
+        return;
+    
     // If the root layer does not have a ScrollingStateNode, then we should create one.
     ensureRootStateNodeForFrameView(frameView);