Chromium Code Reviews| Index: ui/events/blink/input_handler_proxy.h |
| diff --git a/ui/events/blink/input_handler_proxy.h b/ui/events/blink/input_handler_proxy.h |
| index e96b31bf40b918d39423a66de100a173a98a902a..b6975888a12182e643a0c26cfeba805810123002 100644 |
| --- a/ui/events/blink/input_handler_proxy.h |
| +++ b/ui/events/blink/input_handler_proxy.h |
| @@ -46,10 +46,14 @@ class InputHandlerProxy |
| } |
| void set_smooth_scroll_enabled(bool value) { smooth_scroll_enabled_ = value; } |
| + void set_gesture_events_for_mouse_wheel(bool value) { |
| + gesture_events_for_mouse_wheel_ = value; |
| + } |
| enum EventDisposition { |
| DID_HANDLE, |
| DID_NOT_HANDLE, |
| + NON_BLOCKING, |
| DROP_EVENT |
| }; |
| EventDisposition HandleInputEventWithLatencyInfo( |
| @@ -91,6 +95,7 @@ class InputHandlerProxy |
| // Helper functions for handling more complicated input events. |
| EventDisposition HandleMouseWheel( |
| const blink::WebMouseWheelEvent& event); |
| + EventDisposition ScrollByMouseWheel(const blink::WebMouseWheelEvent& event); |
| EventDisposition HandleGestureScrollBegin( |
| const blink::WebGestureEvent& event); |
| EventDisposition HandleGestureScrollUpdate( |
| @@ -99,8 +104,8 @@ class InputHandlerProxy |
| const blink::WebGestureEvent& event); |
| EventDisposition HandleGestureFlingStart( |
| const blink::WebGestureEvent& event); |
| - EventDisposition HandleTouchStart( |
| - const blink::WebTouchEvent& event); |
| + EventDisposition HandleTouchStart(const blink::WebTouchEvent& event); |
| + EventDisposition HandleTouchMove(const blink::WebTouchEvent& event); |
| // Returns true if the event should be suppressed due to to an active, |
| // boost-enabled fling, in which case further processing should cease. |
| @@ -187,6 +192,8 @@ class InputHandlerProxy |
| bool uma_latency_reporting_enabled_; |
| + bool gesture_events_for_mouse_wheel_; |
|
tdresser
2016/02/09 22:00:14
Maybe use_gesture_events_for_mouse_wheel_?
dtapuska
2016/02/09 22:23:56
Done.
|
| + |
| base::TimeTicks last_fling_animate_time_; |
| DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); |