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

Unified Diff: Source/core/frame/RootFrameViewport.cpp

Issue 1161713004: Rename ScrollableArea::scroll to userScroll (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed comment 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
« no previous file with comments | « Source/core/frame/RootFrameViewport.h ('k') | Source/core/frame/RootFrameViewportTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/RootFrameViewport.cpp
diff --git a/Source/core/frame/RootFrameViewport.cpp b/Source/core/frame/RootFrameViewport.cpp
index 18c437000170df4c889b01fea2fb051793684606..e5107b10de9c20e41b2f0d635cddb9cb6e076888 100644
--- a/Source/core/frame/RootFrameViewport.cpp
+++ b/Source/core/frame/RootFrameViewport.cpp
@@ -276,7 +276,7 @@ GraphicsLayer* RootFrameViewport::layerForVerticalScrollbar() const
return layoutViewport().layerForVerticalScrollbar();
}
-bool RootFrameViewport::scroll(ScrollDirectionPhysical direction, ScrollGranularity granularity, float delta)
+bool RootFrameViewport::userScroll(ScrollDirectionPhysical direction, ScrollGranularity granularity, float delta)
{
updateScrollAnimator();
@@ -288,13 +288,13 @@ bool RootFrameViewport::scroll(ScrollDirectionPhysical direction, ScrollGranular
orientation = HorizontalScrollbar;
if (layoutViewport().userInputScrollable(orientation) && visualViewport().userInputScrollable(orientation))
- return ScrollableArea::scroll(direction, granularity, delta);
+ return ScrollableArea::userScroll(direction, granularity, delta);
if (visualViewport().userInputScrollable(orientation))
- return visualViewport().scroll(direction, granularity, delta);
+ return visualViewport().userScroll(direction, granularity, delta);
if (layoutViewport().userInputScrollable(orientation))
- return layoutViewport().scroll(direction, granularity, delta);
+ return layoutViewport().userScroll(direction, granularity, delta);
return false;
}
« no previous file with comments | « Source/core/frame/RootFrameViewport.h ('k') | Source/core/frame/RootFrameViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698