| Index: content/renderer/input/main_thread_event_queue.h
|
| diff --git a/content/renderer/input/main_thread_event_queue.h b/content/renderer/input/main_thread_event_queue.h
|
| index 3e256b1bb350d6bb004ea8c4153011d6f33e4bac..1db06ed8b5babc087587624f6dc4eb2c9f876399 100644
|
| --- a/content/renderer/input/main_thread_event_queue.h
|
| +++ b/content/renderer/input/main_thread_event_queue.h
|
| @@ -13,7 +13,7 @@
|
| #include "content/common/input/input_event_dispatch_type.h"
|
| #include "content/common/input/web_input_event_queue.h"
|
| #include "content/public/common/content_features.h"
|
| -#include "third_party/WebKit/public/platform/WebInputEvent.h"
|
| +#include "third_party/WebKit/public/platform/CoalescedWebInputEvent.h"
|
| #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
|
| #include "ui/events/blink/web_input_event_traits.h"
|
| #include "ui/events/latency_info.h"
|
| @@ -22,9 +22,10 @@ namespace content {
|
|
|
| class EventWithDispatchType : public ScopedWebInputEventWithLatencyInfo {
|
| public:
|
| - EventWithDispatchType(ui::ScopedWebInputEvent event,
|
| - const ui::LatencyInfo& latency,
|
| - InputEventDispatchType dispatch_type);
|
| + EventWithDispatchType(
|
| + blink::CoalescedWebInputEvent::ScopedWebInputEvent event,
|
| + const ui::LatencyInfo& latency,
|
| + InputEventDispatchType dispatch_type);
|
| ~EventWithDispatchType();
|
| bool CanCoalesceWith(const EventWithDispatchType& other) const
|
| WARN_UNUSED_RESULT;
|
| @@ -58,7 +59,7 @@ class CONTENT_EXPORT MainThreadEventQueueClient {
|
| // channel. Implementors must implement this callback.
|
| virtual void HandleEventOnMainThread(
|
| int routing_id,
|
| - const blink::WebInputEvent* event,
|
| + const blink::CoalescedWebInputEvent* event,
|
| const ui::LatencyInfo& latency,
|
| InputEventDispatchType dispatch_type) = 0;
|
|
|
| @@ -116,7 +117,7 @@ class CONTENT_EXPORT MainThreadEventQueue
|
|
|
| // Called once the compositor has handled |event| and indicated that it is
|
| // a non-blocking event to be queued to the main thread.
|
| - bool HandleEvent(ui::ScopedWebInputEvent event,
|
| + bool HandleEvent(blink::CoalescedWebInputEvent::ScopedWebInputEvent event,
|
| const ui::LatencyInfo& latency,
|
| InputEventDispatchType dispatch_type,
|
| InputEventAckState ack_result);
|
|
|