Title: [116790] trunk/Source/WebCore
- Revision
- 116790
- Author
- [email protected]
- Date
- 2012-05-11 11:48:19 -0700 (Fri, 11 May 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116789 => 116790)
--- trunk/Source/WebCore/ChangeLog 2012-05-11 18:31:41 UTC (rev 116789)
+++ trunk/Source/WebCore/ChangeLog 2012-05-11 18:48:19 UTC (rev 116790)
@@ -1,3 +1,24 @@
+2012-05-11 Julien Chaffraix <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: extract PresentationConsoleMessageHelper from DebuggerPresentationModel.
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (116789 => 116790)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-05-11 18:31:41 UTC (rev 116789)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-05-11 18:48:19 UTC (rev 116790)
@@ -2432,13 +2432,12 @@
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));
}
bool RenderLayer::hasHorizontalOverflow() const
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (116789 => 116790)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2012-05-11 18:31:41 UTC (rev 116789)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2012-05-11 18:48:19 UTC (rev 116790)
@@ -635,7 +635,7 @@
void updateScrollbarsAfterLayout();
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.
void* operator new(size_t) throw();
@@ -883,11 +883,9 @@
// The layer's width/height
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
