| Index: content/renderer/mus/compositor_mus_connection.h
|
| diff --git a/content/renderer/mus/compositor_mus_connection.h b/content/renderer/mus/compositor_mus_connection.h
|
| index 80f3ca5faf65098770c3556f42ebf40de75d5af7..1d3cdd5f79c7d6374d7c3d62f405cfa1f6b91b29 100644
|
| --- a/content/renderer/mus/compositor_mus_connection.h
|
| +++ b/content/renderer/mus/compositor_mus_connection.h
|
| @@ -17,8 +17,7 @@
|
| #include "services/ui/public/cpp/window.h"
|
| #include "services/ui/public/cpp/window_tree_client.h"
|
| #include "services/ui/public/cpp/window_tree_client_delegate.h"
|
| -#include "third_party/WebKit/public/platform/WebInputEvent.h"
|
| -#include "ui/events/blink/scoped_web_input_event.h"
|
| +#include "third_party/WebKit/public/platform/CoalescedWebInputEvent.h"
|
| #include "ui/events/gestures/motion_event_aura.h"
|
|
|
| namespace ui {
|
| @@ -70,7 +69,7 @@ class CONTENT_EXPORT CompositorMusConnection
|
| void OnConnectionLostOnMainThread();
|
|
|
| void OnWindowInputEventOnMainThread(
|
| - ui::ScopedWebInputEvent web_event,
|
| + blink::ScopedCoalescedWebInputEvent web_event,
|
| const base::Callback<void(ui::mojom::EventResult)>& ack);
|
|
|
| void OnWindowInputEventAckOnMainThread(
|
| @@ -98,7 +97,7 @@ class CONTENT_EXPORT CompositorMusConnection
|
| std::unique_ptr<base::Callback<void(ui::mojom::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);
|
|
|
|
|