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

Unified Diff: Source/core/paint/DeprecatedPaintLayerScrollableArea.h

Issue 1223173006: Get rid of clampScrollOffset and make maximumScrollPosition sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revert changes to Element::clientWidth, etc. Created 5 years, 3 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/paint/DeprecatedPaintLayerScrollableArea.h
diff --git a/Source/core/paint/DeprecatedPaintLayerScrollableArea.h b/Source/core/paint/DeprecatedPaintLayerScrollableArea.h
index c7b2756f8cfd8ba57716c3328f8f05e0277ffb08..0a0225dc7f1943af61af0166e8f4a79ea1c360ba 100644
--- a/Source/core/paint/DeprecatedPaintLayerScrollableArea.h
+++ b/Source/core/paint/DeprecatedPaintLayerScrollableArea.h
@@ -132,7 +132,12 @@ public:
// FIXME: We shouldn't allow access to m_overflowRect outside this class.
LayoutRect overflowRect() const { return m_overflowRect; }
- void scrollToOffset(const DoubleSize& scrollOffset, ScrollOffsetClamping = ScrollOffsetUnclamped, ScrollBehavior = ScrollBehaviorInstant);
+ void scrollToPosition(const DoublePoint& scrollPosition, ScrollOffsetClamping = ScrollOffsetUnclamped, ScrollBehavior = ScrollBehaviorInstant);
+
+ void scrollToOffset(const DoubleSize& scrollOffset, ScrollOffsetClamping clamp = ScrollOffsetUnclamped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant)
+ {
+ scrollToPosition(-scrollOrigin() + scrollOffset, clamp, scrollBehavior);
+ }
void scrollToXOffset(double x, ScrollOffsetClamping clamp = ScrollOffsetUnclamped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant)
{
@@ -243,10 +248,6 @@ private:
void computeScrollDimensions();
- // TODO(bokan): This method hides the base class version and is subtly different.
- // Should be unified.
- DoubleSize clampScrollOffset(const DoubleSize&) const;
-
void setScrollOffset(const IntPoint&, ScrollType) override;
void setScrollOffset(const DoublePoint&, ScrollType) override;
« no previous file with comments | « Source/core/layout/LayoutTextControlSingleLine.cpp ('k') | Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698