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

Unified Diff: Source/core/page/EventHandler.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/layout/LayoutBox.cpp ('k') | Source/platform/mac/ScrollAnimatorMac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 6cfb5ac4da40857cf04b2ad674cc0e7b2891759a..17680fb568c943022b1296e3bf08c7893a8f51ad 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -986,7 +986,7 @@ bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity g
if (view) {
ScrollDirectionPhysical physicalDirection =
toPhysicalDirection(direction, view->isVerticalDocument(), view->isFlippedDocument());
- if (view->scrollableArea()->scroll(physicalDirection, granularity)) {
+ if (view->scrollableArea()->userScroll(physicalDirection, granularity)) {
setFrameWasScrolledByUser();
return true;
}
@@ -3654,7 +3654,7 @@ void EventHandler::defaultSpaceEventHandler(KeyboardEvent* event)
ScrollDirectionPhysical physicalDirection =
toPhysicalDirection(direction, view->isVerticalDocument(), view->isFlippedDocument());
- if (view->scrollableArea()->scroll(physicalDirection, ScrollByPage))
+ if (view->scrollableArea()->userScroll(physicalDirection, ScrollByPage))
event->setDefaultHandled();
}
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/platform/mac/ScrollAnimatorMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698