| 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..e276adc515a6e1203562c34a50696ac0eed872b7 100644
|
| --- a/content/renderer/mus/compositor_mus_connection.cc
|
| +++ b/content/renderer/mus/compositor_mus_connection.cc
|
| @@ -95,7 +95,7 @@ void CompositorMusConnection::OnConnectionLostOnMainThread() {
|
| }
|
|
|
| void CompositorMusConnection::OnWindowInputEventOnMainThread(
|
| - ui::ScopedWebInputEvent web_event,
|
| + blink::ScopedCoalescedWebInputEvent web_event,
|
| const base::Callback<void(EventResult)>& ack) {
|
| DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| RenderWidgetMusConnection* connection =
|
| @@ -186,7 +186,8 @@ void CompositorMusConnection::OnWindowInputEvent(
|
| // Take ownership of the callback, indicating that we will handle it.
|
| std::unique_ptr<base::Callback<void(EventResult)>> callback =
|
| std::move(*ack_callback);
|
| - ui::ScopedWebInputEvent web_event(Convert(event).release());
|
| + blink::ScopedCoalescedWebInputEvent web_event(
|
| + new blink::CoalescedWebInputEvent(Convert(event).release()));
|
| // TODO(sad): We probably need to plumb LatencyInfo through Mus.
|
| ui::LatencyInfo info;
|
| input_handler_manager_->HandleInputEvent(
|
| @@ -199,7 +200,7 @@ void CompositorMusConnection::OnWindowInputEvent(
|
| void CompositorMusConnection::DidHandleWindowInputEventAndOverscroll(
|
| std::unique_ptr<base::Callback<void(EventResult)>> ack_callback,
|
| InputEventAckState ack_state,
|
| - ui::ScopedWebInputEvent web_event,
|
| + blink::ScopedCoalescedWebInputEvent web_event,
|
| const ui::LatencyInfo& latency_info,
|
| std::unique_ptr<ui::DidOverscrollParams> overscroll_params) {
|
| // TODO(jonross): We probably need to ack the event based on the consumed
|
| @@ -213,7 +214,7 @@ void CompositorMusConnection::DidHandleWindowInputEventAndOverscroll(
|
| base::Callback<void(EventResult)> ack =
|
| base::Bind(&::DoNothingWithEventResult);
|
| const bool send_ack =
|
| - ui::WebInputEventTraits::ShouldBlockEventStream(*web_event);
|
| + ui::WebInputEventTraits::ShouldBlockEventStream(web_event->event());
|
| if (send_ack) {
|
| // Ultimately, this ACK needs to go back to the Mus client lib which is not
|
| // thread-safe and lives on the compositor thread. For ACKs that are passed
|
|
|