Index: cc/input/input_handler.h |
diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h |
index 9a3956264ec75c1179175524344b0c47ca66ed69..b81ee998f1fc7be74004c99e45158e5bf903d027 100644 |
--- a/cc/input/input_handler.h |
+++ b/cc/input/input_handler.h |
@@ -99,7 +99,15 @@ class CC_EXPORT InputHandler { |
uint32_t main_thread_scrolling_reasons; |
}; |
- enum ScrollInputType { GESTURE, WHEEL, ANIMATED_WHEEL, NON_BUBBLING_GESTURE }; |
+ enum ScrollInputType { |
+ // TODO(dtapuska): crbug.com/593017; Remove GESTURE and just use |
+ // TOUCHSCREEN. |
+ GESTURE, |
+ TOUCHSCREEN = GESTURE, |
+ WHEEL, |
+ ANIMATED_WHEEL, |
+ NON_BUBBLING_GESTURE |
+ }; |
// 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 |
@@ -118,6 +126,12 @@ class CC_EXPORT InputHandler { |
// targets at the root layer. |
virtual ScrollStatus RootScrollBegin(ScrollState* scroll_state, |
ScrollInputType type) = 0; |
+ |
+ // Returns SCROLL_ON_IMPL_THREAD if a layer is actively being scrolled or |
+ // a subsequent call to ScrollAnimated can begin on the impl thread. |
+ virtual ScrollStatus ScrollAnimatedBegin( |
+ const gfx::Point& viewport_point) = 0; |
+ |
virtual ScrollStatus ScrollAnimated(const gfx::Point& viewport_point, |
const gfx::Vector2dF& scroll_delta) = 0; |
@@ -137,7 +151,7 @@ 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, |
+ // Returns SCROLL_STARTED if a layer was actively being scrolled, |
// SCROLL_IGNORED if not. |
virtual ScrollStatus FlingScrollBegin() = 0; |