Replace various ScrollableArea scroll methods with setScrollPosition

Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp

Index: Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp
diff --git a/Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp b/Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp
index b04e90d779ee783168fff559d18f391fcfe7aa77..946e4fb8381f65ce3d37cb44330f08fd30194596 100644
--- a/Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp
+++ b/Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp
@@ -357,12 +357,12 @@ int DeprecatedPaintLayerScrollableArea::scrollSize(ScrollbarOrientation orientat
     return (orientation == HorizontalScrollbar) ? scrollDimensions.width() : scrollDimensions.height();
 }
 
-void DeprecatedPaintLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
+void DeprecatedPaintLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset, ScrollType scrollType)
 {
-    setScrollOffset(DoublePoint(newScrollOffset));
+    setScrollOffset(DoublePoint(newScrollOffset), scrollType);
 }
 
-void DeprecatedPaintLayerScrollableArea::setScrollOffset(const DoublePoint& newScrollOffset)
+void DeprecatedPaintLayerScrollableArea::setScrollOffset(const DoublePoint& newScrollOffset, ScrollType)
 {
     // Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
     if (m_scrollDimensionsDirty)
@@ -612,16 +612,8 @@ void DeprecatedPaintLayerScrollableArea::scrollToOffset(const DoubleSize& scroll
     cancelProgrammaticScrollAnimation();
     DoubleSize newScrollOffset = clamp == ScrollOffsetClamped ? clampScrollOffset(scrollOffset) : scrollOffset;
     if (newScrollOffset != adjustedScrollOffset()) {
-        if (scrollBehavior == ScrollBehaviorAuto)
-            scrollBehavior = scrollBehaviorStyle();
         DoublePoint origin(scrollOrigin());
-        if (scrollBehavior == ScrollBehaviorSmooth) {
-            // FIXME: Make programmaticallyScrollSmoothlyToOffset take DoublePoint. crbug.com/243871.
-            programmaticallyScrollSmoothlyToOffset(toFloatPoint(-origin + newScrollOffset));
-        } else {
-            // FIXME: Make scrollToOffsetWithoutAnimation take DoublePoint. crbug.com/414283.
-            scrollToOffsetWithoutAnimation(toFloatPoint(-origin + newScrollOffset));
-        }
+        ScrollableArea::setScrollPosition(-origin + newScrollOffset, ProgrammaticScroll, scrollBehavior);
     }
 }
 
@@ -642,7 +634,7 @@ void DeprecatedPaintLayerScrollableArea::updateAfterLayout()
 
     if (originalScrollOffset != adjustedScrollOffset()) {
         DoublePoint origin(scrollOrigin());
-        scrollToOffsetWithoutAnimation(toFloatPoint(-origin + adjustedScrollOffset()));
+        ScrollableArea::setScrollPosition(-origin + adjustedScrollOffset(), ProgrammaticScroll);

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

Why does this call the base class instead of DPLSA::setScrollPosition?

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

DPLSA::setScrollPosition calls scrollToOffset. That method only does something
if the scroll offset changed. Update after layout changes the scroll origin, so
when we go to call scrollToOffset with the new offset it looks like it hasn't
changed so it early-outs. We need to call into SA::setScrollPosition to update
scrollbars and the like. This needs cleanup but it's no worse than calling
SA::scrollToOffsetWithoutAnimation. I've added a comment explaining this. One of
the follow up patches changes this to ScrollableArea::scrollPositionChanged
since we really just want to tell the base class to update itself.

     }
 
     bool hasHorizontalOverflow = this->hasHorizontalOverflow();