diff options
| author | jonross <jonross@chromium.org> | 2016-03-08 06:03:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-08 14:04:36 +0000 |
| commit | c3385cc179280dd4b09733b2954be7e9ae3b5112 (patch) | |
| tree | fcb8a119477033e1e18f3b8ca5b4bd0b0445b7ea /content/renderer/mus/render_widget_mus_connection.h | |
| parent | 1d3dd7dbbeea929087e089ae1e8acdaa4fae80aa (diff) | |
| download | chromium_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/mus/render_widget_mus_connection.h')
| -rw-r--r-- | content/renderer/mus/render_widget_mus_connection.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/mus/render_widget_mus_connection.h b/content/renderer/mus/render_widget_mus_connection.h index 26f1b4b..1c9bc03 100644 --- a/content/renderer/mus/render_widget_mus_connection.h +++ b/content/renderer/mus/render_widget_mus_connection.h @@ -33,6 +33,7 @@ class RenderWidgetMusConnection : public RenderWidgetInputHandlerDelegate { private: friend class CompositorMusConnection; + friend class CompositorMusConnectionTest; explicit RenderWidgetMusConnection(int routing_id); ~RenderWidgetMusConnection() override; @@ -56,14 +57,14 @@ class RenderWidgetMusConnection : public RenderWidgetInputHandlerDelegate { void OnConnectionLost(); void OnWindowInputEvent(scoped_ptr<blink::WebInputEvent> input_event, - const base::Closure& ack); + const base::Callback<void(bool)>& ack); const int routing_id_; RenderWidgetInputHandler* input_handler_; scoped_ptr<mus::WindowSurfaceBinding> window_surface_binding_; scoped_refptr<CompositorMusConnection> compositor_mus_connection_; - base::Closure pending_ack_; + base::Callback<void(bool)> pending_ack_; // Used to verify single threaded access. base::ThreadChecker thread_checker_; |