| Index: content/renderer/input/input_event_filter.cc
|
| diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc
|
| index 56799b1128b224d40efe5c5edff70d23b09efa44..567fb7e0970a148928498cb62e8d878b21a3640e 100644
|
| --- a/content/renderer/input/input_event_filter.cc
|
| +++ b/content/renderer/input/input_event_filter.cc
|
| @@ -222,8 +222,10 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message,
|
| return;
|
| ui::ScopedWebInputEvent event =
|
| ui::WebInputEventTraits::Clone(*std::get<0>(params));
|
| - ui::LatencyInfo latency_info = std::get<1>(params);
|
| - InputEventDispatchType dispatch_type = std::get<2>(params);
|
| + std::vector<const blink::WebInputEvent*> coalescedEvents =
|
| + std::get<1>(params);
|
| + ui::LatencyInfo latency_info = std::get<2>(params);
|
| + InputEventDispatchType dispatch_type = std::get<3>(params);
|
|
|
| DCHECK(event);
|
| DCHECK(dispatch_type == DISPATCH_TYPE_BLOCKING ||
|
| @@ -233,7 +235,7 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message,
|
| event->timeStampSeconds = ui::EventTimeStampToSeconds(received_time);
|
|
|
| input_handler_manager_->HandleInputEvent(
|
| - routing_id, std::move(event), latency_info,
|
| + routing_id, std::move(event), coalescedEvents, latency_info,
|
| base::Bind(&InputEventFilter::DidForwardToHandlerAndOverscroll, this,
|
| routing_id, dispatch_type));
|
| };
|
| @@ -289,12 +291,13 @@ void InputEventFilter::SendMessageOnIOThread(
|
| void InputEventFilter::HandleEventOnMainThread(
|
| int routing_id,
|
| const blink::WebInputEvent* event,
|
| + const std::vector<const blink::WebInputEvent*>& coalescedEvents,
|
| const ui::LatencyInfo& latency_info,
|
| InputEventDispatchType dispatch_type) {
|
| TRACE_EVENT_INSTANT0("input", "InputEventFilter::HandlEventOnMainThread",
|
| TRACE_EVENT_SCOPE_THREAD);
|
| - IPC::Message new_msg =
|
| - InputMsg_HandleInputEvent(routing_id, event, latency_info, dispatch_type);
|
| + IPC::Message new_msg = InputMsg_HandleInputEvent(
|
| + routing_id, event, coalescedEvents, latency_info, dispatch_type);
|
| main_listener_.Run(new_msg);
|
| }
|
|
|
|
|