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..4564e8e649434c59de7fb1b8f70eb676ab7c6cf4 100644 |
--- a/ui/events/blink/input_handler_proxy.h |
+++ b/ui/events/blink/input_handler_proxy.h |
@@ -46,10 +46,12 @@ class InputHandlerProxy |
} |
void set_smooth_scroll_enabled(bool value) { smooth_scroll_enabled_ = value; } |
+ void set_scroll_on_mouse_wheel(bool value) { scroll_on_mouse_wheel_ = value; } |
enum EventDisposition { |
DID_HANDLE, |
DID_NOT_HANDLE, |
+ NON_BLOCKING, |
DROP_EVENT |
}; |
EventDisposition HandleInputEventWithLatencyInfo( |
@@ -99,8 +101,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 +189,8 @@ class InputHandlerProxy |
bool uma_latency_reporting_enabled_; |
+ bool scroll_on_mouse_wheel_; |
tdresser
2016/01/26 16:34:37
I'm not a big fan of the naming here, and I'm not
dtapuska
2016/01/26 16:53:15
I didn't care for the name either. Effective it me
tdresser
2016/01/26 18:45:42
Something like "wheel_gestures_enabled_"?
|
+ |
base::TimeTicks last_fling_animate_time_; |
DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); |