Rename ScrollableArea::scroll to userScroll

Source/platform/scroll/ScrollAnimator.cpp

 /*
  * Copyright (c) 2010, Google 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
     : m_scrollableArea(scrollableArea)
     , m_currentPosX(0)
     , m_currentPosY(0)
 {
 }
 
 ScrollAnimator::~ScrollAnimator()
 {
 }
 
-ScrollResultOneDimensional ScrollAnimator::scroll(ScrollbarOrientation orientation, ScrollGranularity, float step, float delta)
+ScrollResultOneDimensional ScrollAnimator::userScroll(ScrollbarOrientation orientation, ScrollGranularity, float step, float delta)
 {
     float& currentPos = (orientation == HorizontalScrollbar) ? m_currentPosX : m_currentPosY;
     float newPos = clampScrollPosition(orientation, currentPos + step * delta);
     if (currentPos == newPos)
         return ScrollResultOneDimensional(false);
 
     float usedDelta = (newPos - currentPos) / step;
     currentPos = newPos;
 
     notifyPositionChanged();
@@ skipping 37 matching lines @@
         result.didScroll = true;
 
         if (deltaY) {
             if (e.granularity() == ScrollByPageWheelEvent) {
                 bool negative = deltaY < 0;
                 deltaY = m_scrollableArea->pageStep(VerticalScrollbar);
                 if (negative)
                     deltaY = -deltaY;
             }
 
-            ScrollResultOneDimensional resultY = scroll(
+            ScrollResultOneDimensional resultY = userScroll(
                 VerticalScrollbar, granularity, m_scrollableArea->pixelStep(VerticalScrollbar), -deltaY);
 
             if (e.granularity() != ScrollByPageWheelEvent) {
                 if (resultY.didScroll)
                     result.unusedScrollDeltaY = -resultY.unusedScrollDelta;
                 else
                     result.unusedScrollDeltaY = deltaY;
             }
         }
 
         if (deltaX) {
             if (e.granularity() == ScrollByPageWheelEvent) {
                 bool negative = deltaX < 0;
                 deltaX = m_scrollableArea->pageStep(HorizontalScrollbar);
                 if (negative)
                     deltaX = -deltaX;
             }
 
-            ScrollResultOneDimensional resultX = scroll(
+            ScrollResultOneDimensional resultX = userScroll(
                 HorizontalScrollbar, granularity, m_scrollableArea->pixelStep(HorizontalScrollbar), -deltaX);
 
             if (e.granularity() != ScrollByPageWheelEvent) {
                 if (resultX.didScroll)
                     result.unusedScrollDeltaX = -resultX.unusedScrollDelta;
                 else
                     result.unusedScrollDeltaX = deltaX;
             }
         }
     }
@@ skipping 21 matching lines @@
 }
 
 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, float pos)
 {
     float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation);
     float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation);
     return std::max(std::min(pos, maxScrollPos), minScrollPos);
 }
 
 } // namespace blink