Changeset 152434 in webkit

Timestamp:

Jul 5, 2013 10:01:31 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

Tons of crashes on bots after r152425
​https://bugs.webkit.org/show_bug.cgi?id=118440
<rdar://problem/14366772>

Reviewed by Sam Weinig.

Null-check the frame's page and early return. It's OK to do this
because it only happens when we're being torn down.

• page/FrameView.cpp:

(WebCore::FrameView::minimumScrollPosition):
(WebCore::FrameView::maximumScrollPosition):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-05  Tim Horton  <timothy_horton@apple.com>
+
+        Tons of crashes on bots after r152425
+        https://bugs.webkit.org/show_bug.cgi?id=118440
+        <rdar://problem/14366772>
+
+        Reviewed by Sam Weinig.
+
+        Null-check the frame's page and early return. It's OK to do this
+        because it only happens when we're being torn down.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::minimumScrollPosition):
+        (WebCore::FrameView::maximumScrollPosition):
+
 2013-07-05  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1643 +1643 @@
 {
     IntPoint minimumPosition(ScrollView::minimumScrollPosition());
-    
+
+    if (!m_frame->page())
+        return minimumPosition;
+
     if (m_frame == m_frame->page()->mainFrame() && m_scrollPinningBehavior == PinToBottom)
         minimumPosition.setY(maximumScrollPosition().y());
@@ -1653 +1656 @@
 {
     IntPoint maximumOffset(contentsWidth() - visibleWidth() - scrollOrigin().x(), totalContentsSize().height() - visibleHeight() - scrollOrigin().y());
+
+    if (!m_frame->page())
+        return maximumOffset;
 
     // With pagination enabled, we can have a negative maximum scroll position.
@@ -1658 +1664 @@
         || scrollOrigin() == IntPoint::zero())
         maximumOffset.clampNegativeToZero();
-    
+
     if (m_frame == m_frame->page()->mainFrame() && m_scrollPinningBehavior == PinToTop)
         maximumOffset.setY(minimumScrollPosition().y());