Replace various ScrollableArea scroll methods with setScrollPosition

Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 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 339 matching lines @@
     point.move(-scrollbarOffset(scrollbar));
     return point;
 }
 
 int DeprecatedPaintLayerScrollableArea::scrollSize(ScrollbarOrientation orientation) const
 {
     IntSize scrollDimensions = maximumScrollPosition() - minimumScrollPosition();
     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)
         computeScrollDimensions();
 
     if (scrollOffset() == toDoubleSize(newScrollOffset))
         return;
 
     DoubleSize scrollDelta = scrollOffset() - toDoubleSize(newScrollOffset);
     m_scrollOffset = toDoubleSize(newScrollOffset);
@@ skipping 229 matching lines @@
     int scrollableLeftOverflow = m_overflowRect.x() - box().borderLeft() - (box().style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft() ? box().verticalScrollbarWidth() : 0);
     int scrollableTopOverflow = m_overflowRect.y() - box().borderTop();
     setScrollOrigin(IntPoint(-scrollableLeftOverflow, -scrollableTopOverflow));
 }
 
 void DeprecatedPaintLayerScrollableArea::scrollToOffset(const DoubleSize& scrollOffset, ScrollOffsetClamping clamp, ScrollBehavior scrollBehavior)
 {
     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);
     }
 }
 
 void DeprecatedPaintLayerScrollableArea::updateAfterLayout()
 {
     ASSERT(box().hasOverflowClip());
 
     m_scrollDimensionsDirty = true;
     DoubleSize originalScrollOffset = adjustedScrollOffset();
 
     computeScrollDimensions();
 
     // Layout may cause us to be at an invalid scroll position. In this case we need
     // to pull our scroll offsets back to the max (or push them up to the min).
     DoubleSize clampedScrollOffset = clampScrollOffset(adjustedScrollOffset());
     if (clampedScrollOffset != adjustedScrollOffset())
         scrollToOffset(clampedScrollOffset);
 
     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();
     bool hasVerticalOverflow = this->hasVerticalOverflow();
 
     {
         // Hits in compositing/overflow/automatically-opt-into-composited-scrolling-after-style-change.html.
         DisableCompositingQueryAsserts disabler;
 
         // overflow:scroll should just enable/disable.
@@ skipping 742 matching lines @@
 void DeprecatedPaintLayerScrollableArea::setTopmostScrollChild(DeprecatedPaintLayer* scrollChild)
 {
     // We only want to track the topmost scroll child for scrollable areas with
     // overlay scrollbars.
     if (!hasOverlayScrollbars())
         return;
     m_nextTopmostScrollChild = scrollChild;
 }
 
 } // namespace blink