Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1187)

Unified Diff: Source/core/rendering/RenderLayer.cpp

Issue 14807003: Unifies ScrollView and RenderLayer to use non-shifted [minPos, maxPos] scroll offset (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix unit tests and ScrollAnimatorMac Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index cb4710c8df9f4617f79c239035241f159278ea7c..3a42657eadf36e750eefed35eeaed4e86518c6cf 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -2579,8 +2579,13 @@ IntPoint RenderLayer::minimumScrollPosition() const
IntPoint RenderLayer::maximumScrollPosition() const
{
- // FIXME: m_scrollSize may not be up-to-date if m_scrollDimensionsDirty is true.
- return -scrollOrigin() + roundedIntSize(m_scrollSize) - visibleContentRect(IncludeScrollbars).size();
+ RenderBox* box = renderBox();
+ if (!box)
+ return -scrollOrigin();
+
+ LayoutRect overflowRect(box->layoutOverflowRect());
+ box->flipForWritingMode(overflowRect);
+ return -scrollOrigin() + enclosingIntRect(overflowRect).size() - enclosingIntRect(box->clientBoxRect()).size();
}
IntRect RenderLayer::visibleContentRect(VisibleContentRectIncludesScrollbars scrollbarInclusion) const

Powered by Google App Engine
This is Rietveld 408576698