Replaced adjustScrollPositionWithinRange with clampScrollPosition

Source/core/frame/RootFrameViewport.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/frame/RootFrameViewport.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/ScrollAlignment.h"
 #include "platform/geometry/DoubleRect.h"
@@ skipping 98 matching lines @@
     DoublePoint locationDelta;
     if (viewScrollResult.didScroll()) {
         locationDelta = -DoublePoint(viewScrollResult.unusedScrollDeltaX, viewScrollResult.unusedScrollDeltaY);
     } else {
         if (event.railsMode() != PlatformEvent::RailsModeVertical)
             locationDelta.setX(-event.deltaX());
         if (event.railsMode() != PlatformEvent::RailsModeHorizontal)
             locationDelta.setY(-event.deltaY());
     }
 
-    DoublePoint targetPosition = visualViewport().adjustScrollPositionWithinRange(
+    DoublePoint targetPosition = visualViewport().clampScrollPosition(
         visualViewport().scrollPositionDouble() + toDoubleSize(locationDelta));
     visualViewport().setScrollPosition(targetPosition, UserScroll);
 
     DoublePoint usedLocationDelta(visualViewport().scrollPositionDouble() - oldOffset);
     if (!viewScrollResult.didScroll() && usedLocationDelta == DoublePoint::zero())
         return ScrollResult();
 
     DoubleSize unusedLocationDelta(locationDelta - usedLocationDelta);
     bool didScrollX = viewScrollResult.didScrollX || unusedLocationDelta.width();
     bool didScrollY = viewScrollResult.didScrollY || unusedLocationDelta.height();
@@ skipping 53 matching lines @@
 {
     // Make sure we use the scroll positions as reported by each viewport's ScrollAnimator, since its
     // ScrollableArea's position may have the fractional part truncated off.
     DoublePoint oldPosition = scrollOffsetFromScrollAnimators();
 
     DoubleSize delta = offset - oldPosition;
 
     if (delta.isZero())
         return;
 
-    DoublePoint targetPosition = layoutViewport().adjustScrollPositionWithinRange(layoutViewport().scrollAnimator()->currentPosition() + delta);
+    DoublePoint targetPosition = layoutViewport().clampScrollPosition(layoutViewport().scrollAnimator()->currentPosition() + delta);
     layoutViewport().setScrollPosition(targetPosition, scrollType);
 
     DoubleSize applied = scrollOffsetFromScrollAnimators() - oldPosition;
     delta -= applied;
 
     if (delta.isZero())
         return;
 
-    targetPosition = visualViewport().adjustScrollPositionWithinRange(visualViewport().scrollAnimator()->currentPosition() + delta);
+    targetPosition = visualViewport().clampScrollPosition(visualViewport().scrollAnimator()->currentPosition() + delta);
     visualViewport().setScrollPosition(targetPosition, scrollType);
 }
 
 IntPoint RootFrameViewport::scrollPosition() const
 {
     return flooredIntPoint(scrollPositionDouble());
 }
 
 DoublePoint RootFrameViewport::scrollPositionDouble() const
 {
@@ skipping 110 matching lines @@
 }
 
 void RootFrameViewport::updateCompositorScrollAnimations()
 {
     ScrollableArea::updateCompositorScrollAnimations();
     layoutViewport().updateCompositorScrollAnimations();
 }
 
 
 } // namespace blink