| Index: content/renderer/input/input_handler_manager.cc
|
| diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
|
| index e14d200b4499cd37e30f4bdb1f734667313d67ef..dbe369263df5cb319cc2876183616bd0ab46ff3c 100644
|
| --- a/content/renderer/input/input_handler_manager.cc
|
| +++ b/content/renderer/input/input_handler_manager.cc
|
| @@ -201,12 +201,12 @@ void InputHandlerManager::ProcessRafAlignedInputOnMainThread(int routing_id) {
|
|
|
| void InputHandlerManager::HandleInputEvent(
|
| int routing_id,
|
| - ui::ScopedWebInputEvent input_event,
|
| + blink::ScopedCoalescedWebInputEvent input_event,
|
| const ui::LatencyInfo& latency_info,
|
| const InputEventAckStateCallback& callback) {
|
| DCHECK(task_runner_->BelongsToCurrentThread());
|
| TRACE_EVENT1("input,benchmark,rail", "InputHandlerManager::HandleInputEvent",
|
| - "type", WebInputEvent::GetName(input_event->type));
|
| + "type", WebInputEvent::GetName(input_event->event().type));
|
|
|
| auto it = input_handlers_.find(routing_id);
|
| if (it == input_handlers_.end()) {
|
| @@ -230,7 +230,7 @@ void InputHandlerManager::HandleInputEvent(
|
| void InputHandlerManager::DidHandleInputEventAndOverscroll(
|
| const InputEventAckStateCallback& callback,
|
| InputHandlerProxy::EventDisposition event_disposition,
|
| - ui::ScopedWebInputEvent input_event,
|
| + blink::ScopedCoalescedWebInputEvent input_event,
|
| const ui::LatencyInfo& latency_info,
|
| std::unique_ptr<ui::DidOverscrollParams> overscroll_params) {
|
| InputEventAckState input_event_ack_state =
|
| @@ -276,7 +276,7 @@ void InputHandlerManager::NeedsMainFrame(int routing_id) {
|
|
|
| void InputHandlerManager::DispatchNonBlockingEventToMainThread(
|
| int routing_id,
|
| - ui::ScopedWebInputEvent event,
|
| + blink::ScopedCoalescedWebInputEvent event,
|
| const ui::LatencyInfo& latency_info) {
|
| DCHECK(task_runner_->BelongsToCurrentThread());
|
| client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event),
|
|
|