Replace various ScrollableArea scroll methods with setScrollPosition

Source/platform/scroll/ScrollableArea.cpp

Index: Source/platform/scroll/ScrollableArea.cpp
diff --git a/Source/platform/scroll/ScrollableArea.cpp b/Source/platform/scroll/ScrollableArea.cpp
index bf24e9bbfdf0cce7b57c03c729ee5b80151cbe57..695459436dbc188b1f0bb50c6b547722f8dba602 100644
--- a/Source/platform/scroll/ScrollableArea.cpp
+++ b/Source/platform/scroll/ScrollableArea.cpp
@@ -158,25 +158,61 @@ bool ScrollableArea::userScroll(ScrollDirectionPhysical direction, ScrollGranula
     return scrollAnimator()->userScroll(orientation, granularity, step, delta).didScroll;
 }
 
-void ScrollableArea::setScrollPosition(const DoublePoint& position, ScrollBehavior behavior)
+void ScrollableArea::setScrollPosition(const DoublePoint& position, ScrollType scrollType, ScrollBehavior behavior)
 {
-    // FIXME(417782): This should be unified with LayerScrollableArea::scrollToOffset.
-    ASSERT_NOT_REACHED();
+    if (behavior == ScrollBehaviorAuto)
+        behavior = scrollBehaviorStyle();
+
+    if (scrollType == CompositorScroll)
+        scrollAnimator()->scrollToOffsetWithoutAnimation(toFloatPoint(position), CompositorScroll);
+    else if (scrollType == ProgrammaticScroll)
+        programmaticScrollHelper(position, behavior);
+    else if (scrollType == UserScroll)
+        userScrollHelper(position, behavior);
+    else
+        ASSERT_NOT_REACHED();
 }
 
-void ScrollableArea::scrollToOffsetWithoutAnimation(const FloatPoint& offset, bool cancelProgrammaticAnimations)
+void ScrollableArea::scrollBy(const DoubleSize& delta, ScrollType type, ScrollBehavior behavior)
 {
-    if (cancelProgrammaticAnimations)
-        cancelProgrammaticScrollAnimation();
-    scrollAnimator()->scrollToOffsetWithoutAnimation(offset);
+    setScrollPosition(scrollPositionDouble() + delta, type, behavior);
 }
 
-void ScrollableArea::scrollToOffsetWithoutAnimation(ScrollbarOrientation orientation, float offset)
+void ScrollableArea::setScrollPositionSingleAxis(ScrollbarOrientation orientation, double position, ScrollType scrollType, ScrollBehavior behavior)
 {
+    DoublePoint newPosition;
     if (orientation == HorizontalScrollbar)
-        scrollToOffsetWithoutAnimation(FloatPoint(offset, scrollAnimator()->currentPosition().y()));
+        newPosition = DoublePoint(position, scrollAnimator()->currentPosition().y());
     else
-        scrollToOffsetWithoutAnimation(FloatPoint(scrollAnimator()->currentPosition().x(), offset));
+        newPosition = DoublePoint(scrollAnimator()->currentPosition().x(), position);
+
+    // TODO(bokan): Note, this doesn't use the derived class versions since this method is currently used
+    // exclusively by code that adjusts the position by the scroll origin and the derived class versions
+    // differ on whether they take that into account or not.
+    ScrollableArea::setScrollPosition(newPosition, scrollType, behavior);
+}
+
+void ScrollableArea::programmaticScrollHelper(const DoublePoint& position, ScrollBehavior scrollBehavior)
+{
+    if (scrollBehavior == ScrollBehaviorSmooth) {
+        if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
+            scrollAnimator->cancelAnimations();
+        programmaticScrollAnimator()->animateToOffset(toFloatPoint(position));
+    } else {
+        // TODO(bokan): This should probably use programmaticScrollAnimator.
+        cancelProgrammaticScrollAnimation();
+        scrollAnimator()->scrollToOffsetWithoutAnimation(toFloatPoint(position), ProgrammaticScroll);
+    }
+}
+
+void ScrollableArea::userScrollHelper(const DoublePoint& position, ScrollBehavior scrollBehavior)
+{
+    if (scrollBehavior == ScrollBehaviorSmooth) {
+        // TODO(bokan)

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

Is ScrollableArea::userScroll eventually going to use this path?

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

That's my hope. It can't right now since it doesn't work on just a simple delta.
Untangling that will be a CL in its own right.

+    } else {
+        cancelProgrammaticScrollAnimation();
+        scrollAnimator()->scrollToOffsetWithoutAnimation(toFloatPoint(position), UserScroll);
+    }
 }
 
 void ScrollableArea::scrollIntoRect(const LayoutRect& rectInContent, const FloatRect& targetRectInFrame)
@@ -197,7 +233,7 @@ void ScrollableArea::scrollIntoRect(const LayoutRect& rectInContent, const Float
 
     DoublePoint targetOffset = DoublePoint(scrollPosition() + scrollDelta);
 
-    setScrollPosition(targetOffset);
+    setScrollPosition(targetOffset, ProgrammaticScroll);
 }
 
 LayoutRect ScrollableArea::scrollIntoView(const LayoutRect& rectInContent, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
@@ -207,26 +243,20 @@ LayoutRect ScrollableArea::scrollIntoView(const LayoutRect& rectInContent, const
     return LayoutRect();
 }
 
-void ScrollableArea::programmaticallyScrollSmoothlyToOffset(const FloatPoint& offset)
-{
-    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
-        scrollAnimator->cancelAnimations();
-    programmaticScrollAnimator()->animateToOffset(offset);
-}
-
 void ScrollableArea::notifyScrollPositionChanged(const DoublePoint& position)
 {
-    scrollPositionChanged(position);
+    // TODO(bokan): This should probably be something other than CompositorScroll.
+    scrollPositionChanged(position, CompositorScroll);
     scrollAnimator()->setCurrentPosition(toFloatPoint(scrollPositionDouble()));
 }
 
-void ScrollableArea::scrollPositionChanged(const DoublePoint& position)
+void ScrollableArea::scrollPositionChanged(const DoublePoint& position, ScrollType scrollType)
 {
     TRACE_EVENT0("blink", "ScrollableArea::scrollPositionChanged");
 
     DoublePoint oldPosition = scrollPositionDouble();
     // Tell the derived class to scroll its contents.
-    setScrollOffset(position);
+    setScrollOffset(position, scrollType);
 
     Scrollbar* verticalScrollbar = this->verticalScrollbar();
 
@@ -303,12 +333,12 @@ DoublePoint ScrollableArea::adjustScrollPositionWithinRange(const DoublePoint& s
 // NOTE: Only called from Internals for testing.
 void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset)
 {
-    setScrollOffsetFromAnimation(DoublePoint(offset));
+    setScrollOffsetFromAnimation(DoublePoint(offset), ProgrammaticScroll);
 }
 
-void ScrollableArea::setScrollOffsetFromAnimation(const DoublePoint& offset)
+void ScrollableArea::setScrollOffsetFromAnimation(const DoublePoint& offset, ScrollType scrollType)
 {
-    scrollPositionChanged(offset);
+    scrollPositionChanged(offset, scrollType);
 }
 
 void ScrollableArea::willStartLiveResize()