Replace various ScrollableArea scroll methods with setScrollPosition

Source/core/paint/DeprecatedPaintLayerScrollableArea.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 76 matching lines @@
     virtual void invalidateScrollCornerRect(const IntRect&) override;
     virtual bool shouldUseIntegerScrollOffset() const override;
     virtual bool isActive() const override;
     virtual bool isScrollCornerVisible() const override;
     virtual IntRect scrollCornerRect() const override;
     virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override;
     virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override;
     virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const override;
     virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override;
     virtual int scrollSize(ScrollbarOrientation) const override;
-    virtual void setScrollOffset(const IntPoint&) override;
-    virtual void setScrollOffset(const DoublePoint&) override;
     virtual IntPoint scrollPosition() const override;
     virtual DoublePoint scrollPositionDouble() const override;
     virtual IntPoint minimumScrollPosition() const override;
     virtual IntPoint maximumScrollPosition() const override;
     virtual IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) const override;
     virtual int visibleHeight() const override;
     virtual int visibleWidth() const override;
     virtual IntSize contentsSize() const override;
     virtual IntPoint lastKnownMousePosition() const override;
     virtual bool scrollAnimatorEnabled() const override;
     virtual bool shouldSuspendScrollAnimations() const override;
     virtual bool scrollbarsCanBeActive() const override;
     virtual IntRect scrollableAreaBoundingBox() const override;
     virtual void registerForAnimation() override;
     virtual void deregisterForAnimation() override;
     virtual bool userInputScrollable(ScrollbarOrientation) const override;
     virtual bool shouldPlaceVerticalScrollbarOnLeft() const override;
     virtual int pageStep(ScrollbarOrientation) const override;
+    virtual ScrollBehavior scrollBehaviorStyle() 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 scrollToOffset(const DoubleSize& scrollOffset, ScrollOffsetClamping = ScrollOffsetUnclamped, ScrollBehavior = ScrollBehaviorInstant);
 
     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);
     }
 
-    virtual void setScrollPosition(const DoublePoint& position, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) override
+    virtual void setScrollPosition(const DoublePoint& position, ScrollType scrollType, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) override
     {
         scrollToOffset(toDoubleSize(position), ScrollOffsetClamped, scrollBehavior);
     }
 
     void updateAfterLayout();
     void updateAfterStyleChange(const ComputedStyle*);
     void updateAfterOverflowRecalc();
 
     virtual bool updateAfterCompositingChange() override;
 
@@ skipping 60 matching lines @@
     DeprecatedPaintLayer* layer() const;
 
     LayoutScrollbarPart* resizer() { return m_resizer; }
 
     const IntPoint& cachedOverlayScrollbarOffset() { return m_cachedOverlayScrollbarOffset; }
     void setCachedOverlayScrollbarOffset(const IntPoint& offset) { m_cachedOverlayScrollbarOffset = offset; }
 
     IntRect rectForHorizontalScrollbar(const IntRect& borderBoxRect) const;
     IntRect rectForVerticalScrollbar(const IntRect& borderBoxRect) const;
 
-protected:
-    virtual ScrollBehavior scrollBehaviorStyle() const override;
-
 private:
     bool hasHorizontalOverflow() const;
     bool hasVerticalOverflow() const;
     bool hasScrollableHorizontalOverflow() const;
     bool hasScrollableVerticalOverflow() const;
 
     void computeScrollDimensions();
 
     DoubleSize clampScrollOffset(const DoubleSize&) const;
 
+    virtual void setScrollOffset(const IntPoint&, ScrollType) override;
+    virtual void setScrollOffset(const DoublePoint&, ScrollType) override;
 
     LayoutUnit verticalScrollbarStart(int minX, int maxX) const;
     LayoutUnit horizontalScrollbarStart(int minX) const;
     IntSize scrollbarOffset(const Scrollbar*) const;
 
     PassRefPtrWillBeRawPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
     void destroyScrollbar(ScrollbarOrientation);
 
     void setHasHorizontalScrollbar(bool hasScrollbar);
     void setHasVerticalScrollbar(bool hasScrollbar);
@@ skipping 40 matching lines @@
     // LayoutObject to hold our custom scroll corner.
     LayoutScrollbarPart* m_scrollCorner;
 
     // LayoutObject to hold our custom resizer.
     LayoutScrollbarPart* m_resizer;
 };
 
 } // namespace blink
 
 #endif // LayerScrollableArea_h