Title: [153393] branches/safari-537-branch/Source/WebCore
- Revision
- 153393
- Author
- [email protected]
- Date
- 2013-07-26 16:54:54 -0700 (Fri, 26 Jul 2013)
Log Message
Merged r153349. <rdar://problem/14545393>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153392 => 153393)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-26 23:51:04 UTC (rev 153392)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-26 23:54:54 UTC (rev 153393)
@@ -1,5 +1,23 @@
2013-07-26 Lucas Forschler <[email protected]>
+ Merge r153349
+
+ 2013-07-25 Tim Horton <[email protected]>
+
+ Null check m_frame in maximum and minimumScrollPosition
+ https://bugs.webkit.org/show_bug.cgi?id=119109
+ <rdar://problem/14545393>
+
+ Reviewed by Darin Adler.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::minimumScrollPosition):
+ (WebCore::FrameView::maximumScrollPosition):
+ Null-check m_frame (and move the early-return after the clamp-to-0
+ as the revert in r152911 should have).
+
+2013-07-26 Lucas Forschler <[email protected]>
+
Merge r153366
2013-07-25 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/page/FrameView.cpp (153392 => 153393)
--- branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-26 23:51:04 UTC (rev 153392)
+++ branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-26 23:54:54 UTC (rev 153393)
@@ -1636,7 +1636,7 @@
{
IntPoint minimumPosition(ScrollView::minimumScrollPosition());
- if (!m_frame->page())
+ if (!m_frame || !m_frame->page())
return minimumPosition;
if (m_frame == m_frame->page()->mainFrame() && m_scrollPinningBehavior == PinToBottom)
@@ -1649,11 +1649,11 @@
{
IntPoint maximumOffset(contentsWidth() - visibleWidth() - scrollOrigin().x(), totalContentsSize().height() - visibleHeight() - scrollOrigin().y());
- if (!m_frame->page())
+ maximumOffset.clampNegativeToZero();
+
+ if (!m_frame || !m_frame->page())
return maximumOffset;
- 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
