Title: [147949] trunk/Source/WebCore
- Revision
- 147949
- Author
- [email protected]
- Date
- 2013-04-08 14:00:12 -0700 (Mon, 08 Apr 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147948 => 147949)
--- trunk/Source/WebCore/ChangeLog 2013-04-08 20:51:40 UTC (rev 147948)
+++ trunk/Source/WebCore/ChangeLog 2013-04-08 21:00:12 UTC (rev 147949)
@@ -1,3 +1,18 @@
+2013-04-08 Beth Dakin <[email protected]>
+
+ 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 <[email protected]>
Simplify ContainerNode::removeChildren
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (147948 => 147949)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2013-04-08 20:51:40 UTC (rev 147948)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2013-04-08 21:00:12 UTC (rev 147949)
@@ -458,7 +458,7 @@
mainThreadScrollingReasons |= HasViewportConstrainedObjectsWithoutSupportingFixedLayers;
if (supportsFixedPositionLayers() && hasVisibleSlowRepaintViewportConstrainedObjects(frameView))
mainThreadScrollingReasons |= HasNonLayerViewportConstrainedObjects;
- if (m_page->mainFrame()->document()->isImageDocument())
+ if (m_page->mainFrame()->document() && m_page->mainFrame()->document()->isImageDocument())
mainThreadScrollingReasons |= IsImageDocument;
return mainThreadScrollingReasons;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
