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.cc | |
| 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.cc')
| -rw-r--r-- | content/renderer/mus/render_widget_mus_connection.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/mus/render_widget_mus_connection.cc b/content/renderer/mus/render_widget_mus_connection.cc index c2dc1d1..bced0df 100644 --- a/content/renderer/mus/render_widget_mus_connection.cc +++ b/content/renderer/mus/render_widget_mus_connection.cc @@ -118,8 +118,8 @@ void RenderWidgetMusConnection::OnDidOverscroll( void RenderWidgetMusConnection::OnInputEventAck( scoped_ptr<InputEventAck> input_event_ack) { DCHECK(!pending_ack_.is_null()); - // TODO(fsamuel): Use the state in |input_event_ack|. - pending_ack_.Run(); + pending_ack_.Run(input_event_ack->state == + InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED); pending_ack_.Reset(); } @@ -161,12 +161,12 @@ void RenderWidgetMusConnection::OnConnectionLost() { void RenderWidgetMusConnection::OnWindowInputEvent( scoped_ptr<blink::WebInputEvent> input_event, - const base::Closure& ack) { + const base::Callback<void(bool)>& ack) { DCHECK(thread_checker_.CalledOnValidThread()); // If we don't yet have a RenderWidgetInputHandler then we don't yet have // an initialized RenderWidget. if (!input_handler_) { - ack.Run(); + ack.Run(false); return; } // TODO(fsamuel): It would be nice to add this DCHECK but the reality is an |