| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/mus/compositor_mus_connection.h" | 5 #include "content/renderer/mus/compositor_mus_connection.h" |
| 6 | 6 |
| 7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
| 8 #include "content/common/input/web_input_event_traits.h" | |
| 9 #include "content/renderer/input/input_handler_manager.h" | 8 #include "content/renderer/input/input_handler_manager.h" |
| 10 #include "content/renderer/mus/render_widget_mus_connection.h" | 9 #include "content/renderer/mus/render_widget_mus_connection.h" |
| 11 #include "mojo/converters/blink/blink_input_events_type_converters.h" | 10 #include "mojo/converters/blink/blink_input_events_type_converters.h" |
| 11 #include "ui/events/blink/web_input_event_traits.h" |
| 12 #include "ui/events/latency_info.h" | 12 #include "ui/events/latency_info.h" |
| 13 #include "ui/events/mojo/event.mojom.h" | 13 #include "ui/events/mojo/event.mojom.h" |
| 14 | 14 |
| 15 using ui::mojom::EventResult; | 15 using ui::mojom::EventResult; |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 void DoNothingWithEventResult(EventResult result) {} | 19 void DoNothingWithEventResult(EventResult result) {} |
| 20 | 20 |
| 21 } // namespace | 21 } // namespace |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 // TODO(sad): We probably need to plumb LatencyInfo through Mus. | 130 // TODO(sad): We probably need to plumb LatencyInfo through Mus. |
| 131 ui::LatencyInfo info; | 131 ui::LatencyInfo info; |
| 132 InputEventAckState ack_state = input_handler_manager_->HandleInputEvent( | 132 InputEventAckState ack_state = input_handler_manager_->HandleInputEvent( |
| 133 routing_id_, web_event.get(), &info); | 133 routing_id_, web_event.get(), &info); |
| 134 // TODO(jonross): We probably need to ack the event based on the consumed | 134 // TODO(jonross): We probably need to ack the event based on the consumed |
| 135 // state. | 135 // state. |
| 136 if (ack_state != INPUT_EVENT_ACK_STATE_NOT_CONSUMED) | 136 if (ack_state != INPUT_EVENT_ACK_STATE_NOT_CONSUMED) |
| 137 return; | 137 return; |
| 138 base::Callback<void(EventResult)> ack = | 138 base::Callback<void(EventResult)> ack = |
| 139 base::Bind(&::DoNothingWithEventResult); | 139 base::Bind(&::DoNothingWithEventResult); |
| 140 const bool send_ack = WebInputEventTraits::ShouldBlockEventStream(*web_event); | 140 const bool send_ack = |
| 141 ui::WebInputEventTraits::ShouldBlockEventStream(*web_event); |
| 141 if (send_ack) { | 142 if (send_ack) { |
| 142 // Ultimately, this ACK needs to go back to the Mus client lib which is not | 143 // Ultimately, this ACK needs to go back to the Mus client lib which is not |
| 143 // thread-safe and lives on the compositor thread. For ACKs that are passed | 144 // thread-safe and lives on the compositor thread. For ACKs that are passed |
| 144 // to the main thread we pass them back to the compositor thread via | 145 // to the main thread we pass them back to the compositor thread via |
| 145 // OnWindowInputEventAckOnMainThread. | 146 // OnWindowInputEventAckOnMainThread. |
| 146 ack = | 147 ack = |
| 147 base::Bind(&CompositorMusConnection::OnWindowInputEventAckOnMainThread, | 148 base::Bind(&CompositorMusConnection::OnWindowInputEventAckOnMainThread, |
| 148 this, *ack_callback->get()); | 149 this, *ack_callback->get()); |
| 149 ack_callback->reset(); | 150 ack_callback->reset(); |
| 150 } | 151 } |
| 151 main_task_runner_->PostTask( | 152 main_task_runner_->PostTask( |
| 152 FROM_HERE, | 153 FROM_HERE, |
| 153 base::Bind(&CompositorMusConnection::OnWindowInputEventOnMainThread, this, | 154 base::Bind(&CompositorMusConnection::OnWindowInputEventOnMainThread, this, |
| 154 base::Passed(std::move(web_event)), ack)); | 155 base::Passed(std::move(web_event)), ack)); |
| 155 } | 156 } |
| 156 | 157 |
| 157 } // namespace content | 158 } // namespace content |
| OLD | NEW |