Replace various ScrollableArea scroll methods with setScrollPosition

Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1481 matching lines @@
     // really mess things up if an anchor scroll comes at a bad moment.
     m_frame->document()->updateLayoutTreeIfNeeded();
     // Only do a layout if changes have occurred that make it necessary.
     LayoutView* layoutView = this->layoutView();
     if (layoutView && layoutView->needsLayout())
         layout();
     else
         scrollToAnchor();
 }
 
-void FrameView::setScrollPosition(const DoublePoint& scrollPoint, ScrollBehavior scrollBehavior)
+void FrameView::setScrollPosition(const DoublePoint& scrollPoint, ScrollType scrollType, ScrollBehavior scrollBehavior)
 {
     cancelProgrammaticScrollAnimation();
     m_maintainScrollPositionAnchor = nullptr;
 
     DoublePoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint);
     if (newScrollPosition == scrollPositionDouble())
         return;
 
     if (scrollBehavior == ScrollBehaviorAuto)
         scrollBehavior = scrollBehaviorStyle();
 
     if (scrollBehavior == ScrollBehaviorInstant) {
         DoubleSize newOffset(newScrollPosition.x(), newScrollPosition.y());
+        // TODO(bokan): Why do we need to go through updateScrollbars? If not, we can
+        // just delete this whole method and use the base version.
         updateScrollbars(newOffset);
     } else {
-        programmaticallyScrollSmoothlyToOffset(toFloatPoint(newScrollPosition));
+        ScrollableArea::setScrollPosition(newScrollPosition, ProgrammaticScroll, ScrollBehaviorSmooth);
     }
 }
 
 void FrameView::setElasticOverscroll(const FloatSize& elasticOverscroll)
 {
     m_elasticOverscroll = elasticOverscroll;
     if (m_horizontalScrollbar) {
         float delta = elasticOverscroll.width() - m_horizontalScrollbar->elasticOverscroll();
         if (delta != 0) {
             m_horizontalScrollbar->setElasticOverscroll(elasticOverscroll.width());
@@ skipping 1677 matching lines @@
     // If no scrollbars are present, the content may still be scrollable.
     if (!scrollbar) {
         IntSize scrollSize = m_contentsSize - visibleContentRect().size();
         scrollSize.clampNegativeToZero();
         return orientation == HorizontalScrollbar ? scrollSize.width() : scrollSize.height();
     }
 
     return scrollbar->totalSize() - scrollbar->visibleSize();
 }
 
-void FrameView::setScrollOffset(const IntPoint& offset)
+void FrameView::setScrollOffset(const IntPoint& offset, ScrollType)
 {
     scrollTo(DoublePoint(adjustScrollPositionWithinRange(offset)));
 }
 
-void FrameView::setScrollOffset(const DoublePoint& offset)
+void FrameView::setScrollOffset(const DoublePoint& offset, ScrollType)
 {
     scrollTo(adjustScrollPositionWithinRange(offset));
 }
 
 void FrameView::windowResizerRectChanged()
 {
     updateScrollbars(scrollOffsetDouble());
 }
 
 bool FrameView::hasOverlayScrollbars() const
@@ skipping 221 matching lines @@
     setScrollOffsetFromUpdateScrollbars(desiredOffset);
 }
 
 void FrameView::setScrollOffsetFromUpdateScrollbars(const DoubleSize& offset)
 {
     DoublePoint adjustedScrollPosition = DoublePoint(offset);
 
     adjustedScrollPosition = adjustScrollPositionWithinRange(adjustedScrollPosition);
 
     if (adjustedScrollPosition != scrollPositionDouble() || scrollOriginChanged()) {
-        ScrollableArea::scrollToOffsetWithoutAnimation(toFloatPoint(adjustedScrollPosition));
+        ScrollableArea::setScrollPosition(adjustedScrollPosition, ProgrammaticScroll);
         resetScrollOriginChanged();
     }
 }
 
 const int panIconSizeLength = 16;
 
 IntRect FrameView::rectToCopyOnScroll() const
 {
     IntRect scrollViewRect = convertToContainingWindow(IntRect((shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar()) ? verticalScrollbar()->width() : 0, 0, visibleWidth(), visibleHeight()));
     if (hasOverlayScrollbars()) {
@@ skipping 265 matching lines @@
 }
 
 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
 {
     LayoutRect viewRect(visibleContentRect());
     LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInContent, alignX, alignY);
 
     double xOffset = exposeRect.x();
     double yOffset = exposeRect.y();
 
-    setScrollPosition(DoublePoint(xOffset, yOffset));
+    setScrollPosition(DoublePoint(xOffset, yOffset), ProgrammaticScroll);
 
     // Scrolling the FrameView cannot change the input rect's location relative to the document.
     return rectInContent;
 }
 
 IntRect FrameView::scrollCornerRect() const
 {
     IntRect cornerRect;
 
     if (hasOverlayScrollbars())
@@ skipping 260 matching lines @@
 
     if (!graphicsLayer)
         return;
 
     DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentLayoutObject(), paintInvalidationContainer, viewRect);
 
     graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, WebRect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosingIntRect(viewRect)));
 }
 
 } // namespace blink