Replaced adjustScrollPositionWithinRange with clampScrollPosition

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 1473 matching lines @@
     if (layoutView && layoutView->needsLayout())
         layout();
     else
         scrollToAnchor();
 }
 
 void FrameView::setScrollPosition(const DoublePoint& scrollPoint, ScrollType scrollType, ScrollBehavior scrollBehavior)
 {
     m_maintainScrollPositionAnchor = nullptr;
 
-    DoublePoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint);
+    DoublePoint newScrollPosition = clampScrollPosition(scrollPoint);
     if (newScrollPosition == scrollPositionDouble())
         return;
 
     if (scrollBehavior == ScrollBehaviorAuto)
         scrollBehavior = scrollBehaviorStyle();
 
     ScrollableArea::setScrollPosition(newScrollPosition, scrollType, scrollBehavior);
 }
 
 void FrameView::setElasticOverscroll(const FloatSize& elasticOverscroll)
@@ skipping 1686 matching lines @@
         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, ScrollType)
 {
-    scrollTo(DoublePoint(adjustScrollPositionWithinRange(offset)));
+    scrollTo(clampScrollPosition(offset));
 }
 
 void FrameView::setScrollOffset(const DoublePoint& offset, ScrollType)
 {
-    scrollTo(adjustScrollPositionWithinRange(offset));
+    scrollTo(clampScrollPosition(offset));
 }
 
 void FrameView::windowResizerRectChanged()
 {
     updateScrollbars(scrollOffsetDouble());
 }
 
 bool FrameView::hasOverlayScrollbars() const
 {
 
@@ skipping 214 matching lines @@
             invalidateRect(IntRect(oldVisibleSize.width(), 0, newVisibleSize.width() - oldVisibleSize.width(), newVisibleSize.height()));
     }
     if (newVisibleSize.height() > oldVisibleSize.height())
         invalidateRect(IntRect(0, oldVisibleSize.height(), newVisibleSize.width(), newVisibleSize.height() - oldVisibleSize.height()));
 
     setScrollOffsetFromUpdateScrollbars(desiredOffset);
 }
 
 void FrameView::setScrollOffsetFromUpdateScrollbars(const DoubleSize& offset)
 {
-    DoublePoint adjustedScrollPosition = DoublePoint(offset);
-
-    adjustedScrollPosition = adjustScrollPositionWithinRange(adjustedScrollPosition);
+    DoublePoint adjustedScrollPosition = clampScrollPosition(DoublePoint(offset));
 
     if (adjustedScrollPosition != scrollPositionDouble() || scrollOriginChanged()) {
         ScrollableArea::setScrollPosition(adjustedScrollPosition, ProgrammaticScroll);
         resetScrollOriginChanged();
     }
 }
 
 const int panIconSizeLength = 16;
 
 IntRect FrameView::rectToCopyOnScroll() const
@@ skipping 521 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