Rename ScrollableArea::scroll to userScroll

Source/platform/scroll/ScrollAnimatorNone.h

 /*
  * Copyright (c) 2011, 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 26 matching lines @@
 
 class ScrollAnimatorNoneTest;
 
 namespace blink {
 
 class PLATFORM_EXPORT ScrollAnimatorNone : public ScrollAnimator {
 public:
     explicit ScrollAnimatorNone(ScrollableArea*);
     virtual ~ScrollAnimatorNone();
 
-    virtual ScrollResultOneDimensional scroll(ScrollbarOrientation, ScrollGranularity, float step, float delta) override;
+    virtual ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularity, float step, float delta) override;
     virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;
 
     virtual void cancelAnimations() override;
     virtual void serviceScrollAnimations() override;
     virtual bool hasRunningAnimation() const override;
 
     virtual void updateAfterLayout() override;
     virtual void willEndLiveResize() override;
     virtual void didAddVerticalScrollbar(Scrollbar*) override;
     virtual void didAddHorizontalScrollbar(Scrollbar*) override;
@@ skipping 87 matching lines @@
     PerAxisData m_horizontalData;
     PerAxisData m_verticalData;
 
     double m_startTime;
     bool m_animationActive;
 };
 
 } // namespace blink
 
 #endif // ScrollAnimatorNone_h