Revert of Refactor ScrollableArea::setScrollPosition.

third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 292 matching lines @@
   void scrollbarVisibilityChanged() override;
   IntRect scrollableAreaBoundingBox() const override;
   void registerForAnimation() override;
   void deregisterForAnimation() override;
   bool userInputScrollable(ScrollbarOrientation) const override;
   bool shouldPlaceVerticalScrollbarOnLeft() const override;
   int pageStep(ScrollbarOrientation) const override;
   ScrollBehavior scrollBehaviorStyle() const override;
   CompositorAnimationTimeline* compositorAnimationTimeline() const override;
 
+  double scrollXOffset() const {
+    return m_scrollOffset.width() + scrollOrigin().x();
+  }
+  double scrollYOffset() const {
+    return m_scrollOffset.height() + scrollOrigin().y();
+  }
+
   DoubleSize scrollOffset() const { return m_scrollOffset; }
 
   // FIXME: We shouldn't allow access to m_overflowRect outside this class.
   LayoutRect overflowRect() const { return m_overflowRect; }
 
+  void scrollToPosition(const DoublePoint& scrollPosition,
+                        ScrollOffsetClamping = ScrollOffsetUnclamped,
+                        ScrollBehavior = ScrollBehaviorInstant,
+                        ScrollType = ProgrammaticScroll);
+
   void scrollToOffset(const DoubleSize& scrollOffset,
+                      ScrollOffsetClamping clamp = ScrollOffsetUnclamped,
                       ScrollBehavior scrollBehavior = ScrollBehaviorInstant,
                       ScrollType scrollType = ProgrammaticScroll) {
-    ScrollableArea::setScrollPosition(-scrollOrigin() + scrollOffset,
-                                      scrollType, scrollBehavior);
+    scrollToPosition(-scrollOrigin() + scrollOffset, clamp, scrollBehavior,
+                     scrollType);
+  }
+
+  void scrollToXOffset(double x,
+                       ScrollOffsetClamping clamp = ScrollOffsetUnclamped,
+                       ScrollBehavior scrollBehavior = ScrollBehaviorInstant) {
+    scrollToOffset(DoubleSize(x, scrollYOffset()), clamp, scrollBehavior);
+  }
+
+  void scrollToYOffset(double y,
+                       ScrollOffsetClamping clamp = ScrollOffsetUnclamped,
+                       ScrollBehavior scrollBehavior = ScrollBehaviorInstant) {
+    scrollToOffset(DoubleSize(scrollXOffset(), y), clamp, scrollBehavior);
   }
 
   void setScrollPosition(
       const DoublePoint& position,
       ScrollType scrollType,
       ScrollBehavior scrollBehavior = ScrollBehaviorInstant) override {
-    scrollToOffset(toDoubleSize(position), scrollBehavior, scrollType);
+    scrollToOffset(toDoubleSize(position), ScrollOffsetClamped, scrollBehavior,
+                   scrollType);
   }
 
-  // This will set the scroll position without clamping, and it will do all
-  // post-update work even if the scroll position didn't change.
-  void setScrollPositionUnconditionally(const DoublePoint&,
-                                        ScrollType = ProgrammaticScroll);
-
   // TODO(szager): Actually run these after all of layout is finished.  Currently, they
   // run at the end of box()'es layout (or after all flexbox layout has finished) but while
   // document layout is still happening.
   void updateAfterLayout();
   void clampScrollPositionsAfterLayout();
 
   void updateAfterStyleChange(const ComputedStyle*);
   void updateAfterOverflowRecalc();
 
   bool updateAfterCompositingChange() override;
@@ skipping 21 matching lines @@
   LayoutUnit scrollHeight() const;
   int pixelSnappedScrollWidth() const;
   int pixelSnappedScrollHeight() const;
 
   int verticalScrollbarWidth(
       OverlayScrollbarClipBehavior = IgnoreOverlayScrollbarSize) const;
   int horizontalScrollbarHeight(
       OverlayScrollbarClipBehavior = IgnoreOverlayScrollbarSize) const;
 
   DoubleSize adjustedScrollOffset() const {
-    return toDoubleSize(DoublePoint(scrollOrigin()) + m_scrollOffset);
+    return DoubleSize(scrollXOffset(), scrollYOffset());
   }
 
   void positionOverflowControls();
 
   // isPointInResizeControl() is used for testing if a pointer/touch position is in the resize control
   // area.
   bool isPointInResizeControl(const IntPoint& absolutePoint,
                               ResizerHitTestType) const;
   bool hitTestOverflowControls(HitTestResult&, const IntPoint& localPoint);
 
@@ skipping 200 matching lines @@
 
 DEFINE_TYPE_CASTS(PaintLayerScrollableArea,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->isPaintLayerScrollableArea(),
                   scrollableArea.isPaintLayerScrollableArea());
 
 }  // namespace blink
 
 #endif  // LayerScrollableArea_h