Replaced adjustScrollPositionWithinRange with clampScrollPosition

Source/platform/scroll/ScrollableArea.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 145 matching lines @@
 
     return scrollAnimator()->userScroll(orientation, granularity, step, delta);
 }
 
 void ScrollableArea::setScrollPosition(const DoublePoint& position, ScrollType scrollType, ScrollBehavior behavior)
 {
     if (behavior == ScrollBehaviorAuto)
         behavior = scrollBehaviorStyle();
 
     if (scrollType == CompositorScroll)
-        scrollPositionChanged(adjustScrollPositionWithinRange(position), CompositorScroll);
+        scrollPositionChanged(clampScrollPosition(position), CompositorScroll);
     else if (scrollType == ProgrammaticScroll)
         programmaticScrollHelper(position, behavior);
     else if (scrollType == UserScroll)
         userScrollHelper(position, behavior);
     else
         ASSERT_NOT_REACHED();
 }
 
 void ScrollableArea::scrollBy(const DoubleSize& delta, ScrollType type, ScrollBehavior behavior)
 {
@@ skipping 122 matching lines @@
 ScrollResult ScrollableArea::handleWheel(const PlatformWheelEvent& wheelEvent)
 {
     // Wheel events which do not scroll are used to trigger zooming.
     if (!wheelEvent.canScroll())
         return ScrollResult();
 
     cancelProgrammaticScrollAnimation();
     return scrollAnimator()->handleWheelEvent(wheelEvent);
 }
 
-IntPoint ScrollableArea::adjustScrollPositionWithinRange(const IntPoint& scrollPoint) const
-{
-    IntPoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPosition());
-    newScrollPosition = newScrollPosition.expandedTo(minimumScrollPosition());
-    return newScrollPosition;
-}
-
-DoublePoint ScrollableArea::adjustScrollPositionWithinRange(const DoublePoint& scrollPoint) const
-{
-    DoublePoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPositionDouble());
-    newScrollPosition = newScrollPosition.expandedTo(minimumScrollPositionDouble());
-    return newScrollPosition;
-}
-
 // NOTE: Only called from Internals for testing.
 void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset)
 {
     scrollPositionChanged(DoublePoint(offset), ProgrammaticScroll);
 }
 
 void ScrollableArea::willStartLiveResize()
 {
     if (m_inLiveResize)
         return;
@@ skipping 283 matching lines @@
         verticalScrollbarWidth = !verticalBar->isOverlayScrollbar() ? verticalBar->width() : 0;
     if (Scrollbar* horizontalBar = horizontalScrollbar())
         horizontalScrollbarHeight = !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0;
 
     return IntSize(std::max(0, size.width() - verticalScrollbarWidth),
         std::max(0, size.height() - horizontalScrollbarHeight));
 
 }
 
 } // namespace blink