Changeset 147949 in webkit

Timestamp:

Apr 8, 2013 2:00:12 PM (11 years ago)

Author:

Beth Dakin

Message:

Crash in ScrollingCoordinator::mainThreadScrollingReasons() when going back
​https://bugs.webkit.org/show_bug.cgi?id=114214
-and corresponding-
<rdar://problem/13208616>

Reviewed by Anders Carlsson.

When a page is restoring from the page cache, the mainFrame can have a null
Document. So we should null-check the Document here.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::mainThreadScrollingReasons):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-08  Beth Dakin  <bdakin@apple.com>
+
+        Crash in ScrollingCoordinator::mainThreadScrollingReasons() when going back
+        https://bugs.webkit.org/show_bug.cgi?id=114214
+        -and corresponding-
+        <rdar://problem/13208616>
+
+        Reviewed by Anders Carlsson.
+
+        When a page is restoring from the page cache, the mainFrame can have a null 
+        Document. So we should null-check the Document here. 
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::mainThreadScrollingReasons):
+
 2013-04-08  Andrei Bucur  <abucur@adobe.com>
 

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

@@ -459 +459 @@
     if (supportsFixedPositionLayers() && hasVisibleSlowRepaintViewportConstrainedObjects(frameView))
         mainThreadScrollingReasons |= HasNonLayerViewportConstrainedObjects;
-    if (m_page->mainFrame()->document()->isImageDocument())
+    if (m_page->mainFrame()->document() && m_page->mainFrame()->document()->isImageDocument())
         mainThreadScrollingReasons |= IsImageDocument;