summaryrefslogtreecommitdiffstats
path: root/content/renderer/input/input_handler_manager.h
diff options
context:
space:
mode:
authorjonross <jonross@chromium.org>2016-03-08 06:03:26 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-08 14:04:36 +0000
commitc3385cc179280dd4b09733b2954be7e9ae3b5112 (patch)
treefcb8a119477033e1e18f3b8ca5b4bd0b0445b7ea /content/renderer/input/input_handler_manager.h
parent1d3dd7dbbeea929087e089ae1e8acdaa4fae80aa (diff)
downloadchromium_src-c3385cc179280dd4b09733b2954be7e9ae3b5112.zip
chromium_src-c3385cc179280dd4b09733b2954be7e9ae3b5112.tar.gz
chromium_src-c3385cc179280dd4b09733b2954be7e9ae3b5112.tar.bz2
Update WindowTree::OnWindowInputEventAck to include handled
To support post-target accelerators we plan to have the client application report whether an input event was handled or not, when ack-ing the event. This change updates WindowTree::OnWindowInputEventAck to include a boolean parameter |handled|. PlatformWindowMus will always mark events as handled. CompositorMusConnection will base the handled state on the ack state of the renderer. TEST=WindowTreeClientImplTest, WindowTreeApptest, WindowTreeTest, CompositorMusConnectionTest BUG=560478 Review URL: https://codereview.chromium.org/1749323002 Cr-Commit-Position: refs/heads/master@{#379821}
Diffstat (limited to 'content/renderer/input/input_handler_manager.h')
-rw-r--r--content/renderer/input/input_handler_manager.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/content/renderer/input/input_handler_manager.h b/content/renderer/input/input_handler_manager.h
index c8bfb75..a77a67e 100644
--- a/content/renderer/input/input_handler_manager.h
+++ b/content/renderer/input/input_handler_manager.h
@@ -47,7 +47,7 @@ class InputHandlerManager {
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
InputHandlerManagerClient* client,
scheduler::RendererScheduler* renderer_scheduler);
- ~InputHandlerManager();
+ virtual ~InputHandlerManager();
// Callable from the main thread only.
void AddInputHandler(int routing_id,
@@ -68,9 +68,10 @@ class InputHandlerManager {
void RemoveInputHandler(int routing_id);
// Called from the compositor's thread.
- InputEventAckState HandleInputEvent(int routing_id,
- const blink::WebInputEvent* input_event,
- ui::LatencyInfo* latency_info);
+ virtual InputEventAckState HandleInputEvent(
+ int routing_id,
+ const blink::WebInputEvent* input_event,
+ ui::LatencyInfo* latency_info);
// Called from the compositor's thread.
void DidOverscroll(int routing_id, const DidOverscrollParams& params);