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

Unified Diff: content/renderer/input/input_handler_manager.h

Issue 1631963002: Plumb firing passive event listeners. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_wheel_passive_listeners_2a
Patch Set: Renamed enum value as per wez@ request Created 4 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
Index: content/renderer/input/input_handler_manager.h
diff --git a/content/renderer/input/input_handler_manager.h b/content/renderer/input/input_handler_manager.h
index 6905a88375b3720c8590d9bd8c6ce3ad53213b3a..c8bfb75262e6d3be82b6afda9e59568086c39140 100644
--- a/content/renderer/input/input_handler_manager.h
+++ b/content/renderer/input/input_handler_manager.h
@@ -50,17 +50,20 @@ class InputHandlerManager {
~InputHandlerManager();
// Callable from the main thread only.
- void AddInputHandler(
- int routing_id,
- const base::WeakPtr<cc::InputHandler>& input_handler,
- const base::WeakPtr<RenderViewImpl>& render_view_impl,
- bool enable_smooth_scrolling);
+ void AddInputHandler(int routing_id,
+ const base::WeakPtr<cc::InputHandler>& input_handler,
+ const base::WeakPtr<RenderViewImpl>& render_view_impl,
+ bool enable_smooth_scrolling,
+ bool enable_wheel_gestures);
void ObserveWheelEventAndResultOnMainThread(
int routing_id,
const blink::WebMouseWheelEvent& wheel_event,
const cc::InputHandlerScrollResult& scroll_result);
+ void NonBlockingInputEventHandledOnMainThread(int routing_id,
+ blink::WebInputEvent::Type);
+
// Callback only from the compositor's thread.
void RemoveInputHandler(int routing_id);
@@ -85,13 +88,18 @@ class InputHandlerManager {
const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
const base::WeakPtr<cc::InputHandler>& input_handler,
const base::WeakPtr<RenderViewImpl>& render_view_impl,
- bool enable_smooth_scrolling);
+ bool enable_smooth_scrolling,
+ bool enable_wheel_gestures);
void ObserveWheelEventAndResultOnCompositorThread(
int routing_id,
const blink::WebMouseWheelEvent& wheel_event,
const cc::InputHandlerScrollResult& scroll_result);
+ void NonBlockingInputEventHandledOnCompositorThread(
+ int routing_id,
+ blink::WebInputEvent::Type);
+
typedef base::ScopedPtrHashMap<int, // routing_id
scoped_ptr<InputHandlerWrapper>>
InputHandlerMap;

Powered by Google App Engine
This is Rietveld 408576698