Changeset 116790 in webkit

Timestamp:

May 11, 2012 11:48:19 AM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

Remove RenderLayer::m_scrollOverflow
​https://bugs.webkit.org/show_bug.cgi?id=86226

Reviewed by Simon Fraser.

No expected change in behavior.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::computeScrollDimensions):
Added 2 local variables to compute the left / top scrollable overflows.

• rendering/RenderLayer.h:

(WebCore::RenderLayer::scrolledContentOffset):
Returned m_scrollOffset directly as this is what the old code was doing by adding
m_scrollOrigin then adding m_scrollOverflow (which was set to -m_scrollOrigin in
computeScrollDimensions).

(RenderLayer::m_scrollOffset): Improved the comment about what m_scrollOffset is.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderLayer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-11  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Remove RenderLayer::m_scrollOverflow
+        https://bugs.webkit.org/show_bug.cgi?id=86226
+
+        Reviewed by Simon Fraser.
+
+        No expected change in behavior.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::computeScrollDimensions):
+        Added 2 local variables to compute the left / top scrollable overflows.
+
+        * rendering/RenderLayer.h:
+        (WebCore::RenderLayer::scrolledContentOffset):
+        Returned m_scrollOffset directly as this is what the old code was doing by adding
+        m_scrollOrigin then adding m_scrollOverflow (which was set to -m_scrollOrigin in
+        computeScrollDimensions).
+
+        (RenderLayer::m_scrollOffset): Improved the comment about what m_scrollOffset is.
+
 2012-05-11  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2433 +2433 @@
     m_scrollDimensionsDirty = false;
 
-    m_scrollOverflow.setWidth(overflowLeft() - box->borderLeft());
-    m_scrollOverflow.setHeight(overflowTop() - box->borderTop());
-
     m_scrollSize.setWidth(overflowRight() - overflowLeft());
     m_scrollSize.setHeight(overflowBottom() - overflowTop());
 
-    setScrollOrigin(IntPoint(-m_scrollOverflow.width(), -m_scrollOverflow.height()));
+    int scrollableLeftOverflow = overflowLeft() - box->borderLeft();
+    int scrollableTopOverflow = overflowTop() - box->borderTop();
+    setScrollOrigin(IntPoint(-scrollableLeftOverflow, -scrollableTopOverflow));
 }
 

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -636 +636 @@
 
     friend IntSize RenderBox::scrolledContentOffset() const;
-    IntSize scrolledContentOffset() const { return scrollOffset() + m_scrollOverflow; }
+    IntSize scrolledContentOffset() const { return m_scrollOffset; }
 
     // The normal operator new is disallowed on all render objects.
@@ -884 +884 @@
     IntSize m_layerSize;
 
-    // Our scroll offsets if the view is scrolled.
+    // This is the (scroll) offset from scrollOrigin().
     IntSize m_scrollOffset;
 
-    IntSize m_scrollOverflow;
-    
     // The width/height of our scrolled area.
     LayoutSize m_scrollSize;