Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1436)

Unified Diff: Source/platform/scroll/ScrollAnimatorNone.h

Issue 1161713004: Rename ScrollableArea::scroll to userScroll (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/scroll/ScrollAnimatorNone.h
diff --git a/Source/platform/scroll/ScrollAnimatorNone.h b/Source/platform/scroll/ScrollAnimatorNone.h
index 8f46a982052f6ee77343ca596c981070bb3dd4fe..d00914f64ee788922b25873a17f0ccf317a0b965 100644
--- a/Source/platform/scroll/ScrollAnimatorNone.h
+++ b/Source/platform/scroll/ScrollAnimatorNone.h
@@ -44,7 +44,7 @@ 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;

Powered by Google App Engine
This is Rietveld 408576698