Changeset 90058 in webkit

Timestamp:

Jun 29, 2011 3:53:15 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-29 Anders Carlsson <​andersca@apple.com>

Reviewed by Simon Fraser.

RenderLayer::maximumScrollPosition() is wrong
​https://bugs.webkit.org/show_bug.cgi?id=62667

• platform/ScrollableArea.h: (WebCore::ScrollableArea::isVerticalScrollerPinnedToMinimumPosition): (WebCore::ScrollableArea::isVerticalScrollerPinnedToMaximumPosition): Add these for good measure; they will be needed in an upcoming patch.

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::maximumScrollPosition): Subtract the visible content rect, including the scroll bars.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollableArea.h (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-29  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        RenderLayer::maximumScrollPosition() is wrong
+        https://bugs.webkit.org/show_bug.cgi?id=62667
+
+        * platform/ScrollableArea.h:
+        (WebCore::ScrollableArea::isVerticalScrollerPinnedToMinimumPosition):
+        (WebCore::ScrollableArea::isVerticalScrollerPinnedToMaximumPosition):
+        Add these for good measure; they will be needed in an upcoming patch.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::maximumScrollPosition):
+        Subtract the visible content rect, including the scroll bars.
+
 2011-06-29  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -142 +142 @@
     bool isHorizontalScrollerPinnedToMinimumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) <= minimumScrollPosition().x(); }
     bool isHorizontalScrollerPinnedToMaximumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) >= maximumScrollPosition().x(); }
-    
+    bool isVerticalScrollerPinnedToMinimumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) <= minimumScrollPosition().y(); }
+    bool isVerticalScrollerPinnedToMaximumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) >= maximumScrollPosition().y(); }
+
     virtual bool shouldRubberBandInDirection(ScrollDirection) const { return true; }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1654 +1654 @@
 {
     // FIXME: m_scrollSize may not be up-to-date if m_scrollDimensionsDirty is true.
-    return m_scrollOrigin + m_scrollSize;
+    return m_scrollOrigin + m_scrollSize - visibleContentRect(true).size();
 }