| Index: content/renderer/mus/compositor_mus_connection.cc
|
| diff --git a/content/renderer/mus/compositor_mus_connection.cc b/content/renderer/mus/compositor_mus_connection.cc
|
| index e888e10fdaa26eb41e0de405ab492b00602167b2..7475e1d6623ec36d97be936add04edfe61200bd3 100644
|
| --- a/content/renderer/mus/compositor_mus_connection.cc
|
| +++ b/content/renderer/mus/compositor_mus_connection.cc
|
| @@ -96,6 +96,7 @@ void CompositorMusConnection::OnConnectionLostOnMainThread() {
|
|
|
| void CompositorMusConnection::OnWindowInputEventOnMainThread(
|
| ui::ScopedWebInputEvent web_event,
|
| + const std::vector<const blink::WebInputEvent*>& coalescedEvents,
|
| const base::Callback<void(EventResult)>& ack) {
|
| DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| RenderWidgetMusConnection* connection =
|
| @@ -104,7 +105,7 @@ void CompositorMusConnection::OnWindowInputEventOnMainThread(
|
| ack.Run(EventResult::UNHANDLED);
|
| return;
|
| }
|
| - connection->OnWindowInputEvent(std::move(web_event), ack);
|
| + connection->OnWindowInputEvent(std::move(web_event), coalescedEvents, ack);
|
| }
|
|
|
| void CompositorMusConnection::OnWindowInputEventAckOnMainThread(
|
| @@ -187,10 +188,12 @@ void CompositorMusConnection::OnWindowInputEvent(
|
| std::unique_ptr<base::Callback<void(EventResult)>> callback =
|
| std::move(*ack_callback);
|
| ui::ScopedWebInputEvent web_event(Convert(event).release());
|
| - // TODO(sad): We probably need to plumb LatencyInfo through Mus.
|
| + // TODO(sad): We probably need to plumb LatencyInfo and coalescedEvents
|
| + // through Mus.
|
| ui::LatencyInfo info;
|
| + std::vector<const blink::WebInputEvent*> coalescedEvents;
|
| input_handler_manager_->HandleInputEvent(
|
| - routing_id_, std::move(web_event), info,
|
| + routing_id_, std::move(web_event), coalescedEvents, info,
|
| base::Bind(
|
| &CompositorMusConnection::DidHandleWindowInputEventAndOverscroll,
|
| this, base::Passed(std::move(callback))));
|
| @@ -232,7 +235,8 @@ void CompositorMusConnection::DidHandleWindowInputEventAndOverscroll(
|
| main_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&CompositorMusConnection::OnWindowInputEventOnMainThread, this,
|
| - base::Passed(std::move(web_event)), ack));
|
| + base::Passed(std::move(web_event)),
|
| + std::vector<const blink::WebInputEvent*>(), ack));
|
| }
|
|
|
| } // namespace content
|
|
|