Title: [152511] branches/safari-537-branch/Source/WebCore
- Revision
- 152511
- Author
- [email protected]
- Date
- 2013-07-09 11:54:08 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152434. <rdar://problem/14366772>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152510 => 152511)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 18:49:56 UTC (rev 152510)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 18:54:08 UTC (rev 152511)
@@ -1,5 +1,24 @@
2013-07-09 Lucas Forschler <[email protected]>
+ Merge r152434
+
+ 2013-07-05 Tim Horton <[email protected]>
+
+ 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-09 Lucas Forschler <[email protected]>
+
Merge r152433
2013-07-05 Tim Horton <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/page/FrameView.cpp (152510 => 152511)
--- branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-09 18:49:56 UTC (rev 152510)
+++ branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-09 18:54:08 UTC (rev 152511)
@@ -1642,7 +1642,10 @@
IntPoint FrameView::minimumScrollPosition() const
{
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,11 +1656,14 @@
{
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.
if ((m_frame->page()->pagination().mode == Pagination::Unpaginated && m_pagination.mode == Pagination::Unpaginated)
|| scrollOrigin() == IntPoint::zero())
maximumOffset.clampNegativeToZero();
-
+
if (m_frame == m_frame->page()->mainFrame() && m_scrollPinningBehavior == PinToTop)
maximumOffset.setY(minimumScrollPosition().y());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
