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

Unified Diff: cc/input/input_handler.h

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « cc/debug/debug_colors.cc ('k') | cc/input/scroll_elasticity_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/input_handler.h
diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h
index 954f8d731f5f969cc54ca1026223a082644fefe7..d899a85156e4b63160f3d946b6a65398b2a3aff8 100644
--- a/cc/input/input_handler.h
+++ b/cc/input/input_handler.h
@@ -66,14 +66,14 @@ class CC_EXPORT InputHandler {
// Note these are used in a histogram. Do not reorder or delete existing
// entries.
enum ScrollStatus {
- SCROLL_ON_MAIN_THREAD = 0,
- SCROLL_STARTED,
- SCROLL_IGNORED,
- SCROLL_UNKNOWN,
+ ScrollOnMainThread = 0,
+ ScrollStarted,
+ ScrollIgnored,
+ ScrollUnknown,
// This must be the last entry.
ScrollStatusCount
};
- enum ScrollInputType { GESTURE, WHEEL, NON_BUBBLING_GESTURE };
+ enum ScrollInputType { Gesture, Wheel, NonBubblingGesture };
// Binds a client to this handler to receive notifications. Only one client
// can be bound to an InputHandler. The client must live at least until the
@@ -81,10 +81,10 @@ class CC_EXPORT InputHandler {
virtual void BindToClient(InputHandlerClient* client) = 0;
// Selects a layer to be scrolled at a given point in viewport (logical
- // pixel) coordinates. Returns SCROLL_STARTED if the layer at the coordinates
- // can be scrolled, SCROLL_ON_MAIN_THREAD if the scroll event should instead
- // be delegated to the main thread, or SCROLL_IGNORED if there is nothing to
- // be scrolled at the given coordinates.
+ // pixel) coordinates. Returns ScrollStarted if the layer at the coordinates
+ // can be scrolled, ScrollOnMainThread if the scroll event should instead be
+ // delegated to the main thread, or ScrollIgnored if there is nothing to be
+ // scrolled at the given coordinates.
virtual ScrollStatus ScrollBegin(const gfx::Point& viewport_point,
ScrollInputType type) = 0;
@@ -102,7 +102,7 @@ class CC_EXPORT InputHandler {
// If the scroll delta hits the root layer, and the layer can no longer move,
// the root overscroll accumulated within this ScrollBegin() scope is reported
// in the return value's |accumulated_overscroll| field.
- // Should only be called if ScrollBegin() returned SCROLL_STARTED.
+ // Should only be called if ScrollBegin() returned ScrollStarted.
virtual InputHandlerScrollResult ScrollBy(
const gfx::Point& viewport_point,
const gfx::Vector2dF& scroll_delta) = 0;
@@ -110,14 +110,14 @@ class CC_EXPORT InputHandler {
virtual bool ScrollVerticallyByPage(const gfx::Point& viewport_point,
ScrollDirection direction) = 0;
- // Returns SCROLL_STARTED if a layer was being actively being scrolled,
- // SCROLL_IGNORED if not.
+ // Returns ScrollStarted if a layer was being actively being scrolled,
+ // ScrollIgnored if not.
virtual ScrollStatus FlingScrollBegin() = 0;
virtual void MouseMoveAt(const gfx::Point& mouse_position) = 0;
// Stop scrolling the selected layer. Should only be called if ScrollBegin()
- // returned SCROLL_STARTED.
+ // returned ScrollStarted.
virtual void ScrollEnd() = 0;
virtual void SetRootLayerScrollOffsetDelegate(
« no previous file with comments | « cc/debug/debug_colors.cc ('k') | cc/input/scroll_elasticity_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698