| Index: ui/events/blink/input_handler_proxy.h
|
| diff --git a/ui/events/blink/input_handler_proxy.h b/ui/events/blink/input_handler_proxy.h
|
| index a74be1c1232c91676f9f358d9fe29c78a2969680..aabe80e3c22ff7e9dc01617990fac8f2f70bf499 100644
|
| --- a/ui/events/blink/input_handler_proxy.h
|
| +++ b/ui/events/blink/input_handler_proxy.h
|
| @@ -10,13 +10,12 @@
|
| #include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| #include "cc/input/input_handler.h"
|
| +#include "third_party/WebKit/public/platform/CoalescedWebInputEvent.h"
|
| #include "third_party/WebKit/public/platform/WebGestureCurve.h"
|
| #include "third_party/WebKit/public/platform/WebGestureCurveTarget.h"
|
| #include "third_party/WebKit/public/platform/WebGestureEvent.h"
|
| -#include "third_party/WebKit/public/platform/WebInputEvent.h"
|
| #include "third_party/WebKit/public/web/WebActiveWheelFlingParameters.h"
|
| #include "ui/events/blink/input_scroll_elasticity_controller.h"
|
| -#include "ui/events/blink/scoped_web_input_event.h"
|
| #include "ui/events/blink/synchronous_input_handler_proxy.h"
|
|
|
| namespace ui {
|
| @@ -60,11 +59,11 @@ class InputHandlerProxy
|
| };
|
| using EventDispositionCallback =
|
| base::Callback<void(EventDisposition,
|
| - ScopedWebInputEvent WebInputEvent,
|
| + blink::CoalescedWebInputEvent WebInputEvent,
|
| const LatencyInfo&,
|
| std::unique_ptr<ui::DidOverscrollParams>)>;
|
| void HandleInputEventWithLatencyInfo(
|
| - ScopedWebInputEvent event,
|
| + blink::ScopedCoalescedWebInputEvent event,
|
| const LatencyInfo& latency_info,
|
| const EventDispositionCallback& callback);
|
| EventDisposition HandleInputEvent(const blink::WebInputEvent& event);
|
|
|