Replace various ScrollableArea scroll methods with setScrollPosition

Source/core/frame/RootFrameViewport.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef RootFrameViewport_h
 #define RootFrameViewport_h
 
 #include "core/CoreExport.h"
 #include "platform/scroll/ScrollableArea.h"
 
@@ skipping 11 matching lines @@
 // the layout viewport. Thus, we could say this class is a decorator on the
 // FrameView scrollable area that adds pinch-zoom semantics to scrolling.
 class CORE_EXPORT RootFrameViewport final : public ScrollableArea {
 public:
     static PassOwnPtr<RootFrameViewport> create(ScrollableArea& visualViewport, ScrollableArea& layoutViewport)
     {
         return adoptPtr(new RootFrameViewport(visualViewport, layoutViewport));
     }
 
     // ScrollableArea Implementation
-    void setScrollPosition(const DoublePoint&, ScrollBehavior = ScrollBehaviorInstant) override;
+    void setScrollPosition(const DoublePoint&, ScrollType, ScrollBehavior = ScrollBehaviorInstant) override;
     LayoutRect scrollIntoView(
         const LayoutRect& rectInContent,
         const ScrollAlignment& alignX,
         const ScrollAlignment& alignY) override;
     DoubleRect visibleContentRectDouble(IncludeScrollbarsInRect = ExcludeScrollbars) const override;
     IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) const override;
     bool shouldUseIntegerScrollOffset() const override;
     bool isActive() const override;
     int scrollSize(ScrollbarOrientation) const override;
     bool isScrollCornerVisible() const override;
     IntRect scrollCornerRect() const override;
-    void setScrollOffset(const IntPoint&) override;
-    void setScrollOffset(const DoublePoint&) override;
+    void setScrollOffset(const IntPoint&, ScrollType) override;
+    void setScrollOffset(const DoublePoint&, ScrollType) override;
     IntPoint scrollPosition() const override;
     DoublePoint scrollPositionDouble() const override;
     IntPoint minimumScrollPosition() const override;
     IntPoint maximumScrollPosition() const override;
     DoublePoint maximumScrollPositionDouble() const override;
     IntSize contentsSize() const override;
     bool scrollbarsCanBeActive() const override;
     IntRect scrollableAreaBoundingBox() const override;
     bool userInputScrollable(ScrollbarOrientation) const override;
     bool shouldPlaceVerticalScrollbarOnLeft() const override;
     void invalidateScrollbarRect(Scrollbar*, const IntRect&) override;
     void invalidateScrollCornerRect(const IntRect&) override;
     GraphicsLayer* layerForContainer() const override;
     GraphicsLayer* layerForScrolling() const override;
     GraphicsLayer* layerForHorizontalScrollbar() const override;
     GraphicsLayer* layerForVerticalScrollbar() const override;
     bool userScroll(ScrollDirectionPhysical, ScrollGranularity, float delta = 1) override;
     bool scrollAnimatorEnabled() const override;
     HostWindow* hostWindow() const override;
     void serviceScrollAnimations(double) override;
     // TODO(bokan): This method should be removed. It should be replaced by
     // making EventHandler::handleWheelEvent unpack the WheelEvent and make a
     // call to this class' scroll method.
     ScrollResult handleWheel(const PlatformWheelEvent&) override;
 
+protected:
+    virtual ScrollBehavior scrollBehaviorStyle() const override;

[skobes, 2015/06/04 23:35:47]

This should be public, to match its visibility in ScrollableArea.

[bokan, 2015/06/05 15:15:23]

Done.

[bokan, 2015/06/05 15:17:25]

Should mention: also did this in DPLSA and made DPLSA::setScrollOffset private
for the same reason.

+
 private:
     RootFrameViewport(ScrollableArea& visualViewport, ScrollableArea& layoutViewport);
 
     DoublePoint scrollOffsetFromScrollAnimators() const;
 
     // If either of the layout or visual viewports are scrolled explicitly (i.e. not
     // through this class), their updated offset will not be reflected in this class'
     // animator so use this method to pull updated values when necessary.
     void updateScrollAnimator();
 
     ScrollableArea& visualViewport() const { return m_visualViewport; }
     ScrollableArea& layoutViewport() const { return m_layoutViewport; }
 
     ScrollableArea& m_visualViewport;
     ScrollableArea& m_layoutViewport;
 };
 
 } // namespace blink
 
 #endif // RootFrameViewport_h