| Index: content/browser/renderer_host/input/immediate_input_router.h
|
| diff --git a/content/browser/renderer_host/input/immediate_input_router.h b/content/browser/renderer_host/input/immediate_input_router.h
|
| index 1d1a0c0e168d3eb8814a1809b3e4575ea72f0504..0d00f798dffaec42db0b75f7457572e8a9ee1b05 100644
|
| --- a/content/browser/renderer_host/input/immediate_input_router.h
|
| +++ b/content/browser/renderer_host/input/immediate_input_router.h
|
| @@ -78,8 +78,9 @@ private:
|
| friend class ImmediateInputRouterTest;
|
|
|
| // TouchEventQueueClient
|
| - virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
|
| - InputEventAckState ack_result) OVERRIDE;
|
| + virtual void OnTouchEventAck(const WebKit::WebTouchEvent& event,
|
| + InputEventAckState ack_result,
|
| + ui::LatencyInfo* latency) OVERRIDE;
|
|
|
| bool SendMoveCaret(scoped_ptr<IPC::Message> message);
|
| bool SendSelectRange(scoped_ptr<IPC::Message> message);
|
| @@ -100,7 +101,7 @@ private:
|
| // IPC message handlers
|
| void OnInputEventAck(WebKit::WebInputEvent::Type event_type,
|
| InputEventAckState ack_result,
|
| - const ui::LatencyInfo& latency_info);
|
| + ui::LatencyInfo latency_info);
|
| void OnMsgMoveCaretAck();
|
| void OnSelectRangeAck();
|
| void OnHasTouchEventHandlers(bool has_handlers);
|
| @@ -110,7 +111,7 @@ private:
|
| // if the event was filtered by the |client_| prior to sending.
|
| void ProcessInputEventAck(WebKit::WebInputEvent::Type event_type,
|
| InputEventAckState ack_result,
|
| - const ui::LatencyInfo& latency_info);
|
| + ui::LatencyInfo* latency_info);
|
|
|
| // Called by ProcessInputEventAck() to process a keyboard event ack message.
|
| void ProcessKeyboardAck(int type, InputEventAckState ack_result);
|
| @@ -118,12 +119,15 @@ private:
|
| // Called by ProcessInputEventAck() to process a wheel event ack message.
|
| // This could result in a task being posted to allow additional wheel
|
| // input messages to be coalesced.
|
| - void ProcessWheelAck(InputEventAckState ack_result);
|
| + void ProcessWheelAck(InputEventAckState ack_result,
|
| + ui::LatencyInfo* latency_info);
|
|
|
| // Called by ProcessInputEventAck() to process a gesture event ack message.
|
| // This validates the gesture for suppression of touchpad taps and sends one
|
| // previously queued coalesced gesture if it exists.
|
| - void ProcessGestureAck(int type, InputEventAckState ack_result);
|
| + void ProcessGestureAck(int type,
|
| + InputEventAckState ack_result,
|
| + ui::LatencyInfo* latency);
|
|
|
| // Called on ProcessInputEventAck() to process a touch event ack message.
|
| // This can result in a gesture event being generated and sent back to the
|
|
|