Rename ScrollableArea::scroll to userScroll

Source/platform/scroll/ScrollAnimator.h

 /*
  * 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 @@
 class FloatPoint;
 class ScrollableArea;
 class Scrollbar;
 
 class PLATFORM_EXPORT ScrollAnimator : public RefCounted<ScrollAnimator> {
 public:
     static PassRefPtr<ScrollAnimator> create(ScrollableArea*);
 
     virtual ~ScrollAnimator();
 
-    // Computes a scroll destination for the given parameters.  Returns false if
-    // already at the destination.  Otherwise, starts scrolling towards the
-    // destination and returns true.  Scrolling may be immediate or animated.
-    // The base class implementation always scrolls immediately, never animates.
-    virtual ScrollResultOneDimensional scroll(ScrollbarOrientation, ScrollGranularity, float step, float delta);
+    // Computes a scroll destination for the given parameters.  The returned
+    // ScrollResultOneDimensional will have didScroll set to false if already at
+    // the destination.  Otherwise, starts scrolling towards the destination and
+    // didScroll is true.  Scrolling may be immediate or animated. The base
+    // class implementation always scrolls immediately, never animates.
+    virtual ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularity, float step, float delta);
 
     virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);
 
     ScrollableArea* scrollableArea() const { return m_scrollableArea; }
 
     virtual void setIsActive() { }
 
     virtual ScrollResult handleWheelEvent(const PlatformWheelEvent&);
 
 #if OS(MACOSX)
@@ skipping 40 matching lines @@
     float m_currentPosX; // We avoid using a FloatPoint in order to reduce
     float m_currentPosY; // subclass code complexity.
 
 private:
     float clampScrollPosition(ScrollbarOrientation, float);
 };
 
 } // namespace blink
 
 #endif // ScrollAnimator_h