| Index: content/browser/renderer_host/render_widget_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
| index d50b5584e8889b69d0e88cd982e81536a8151005..420bc9308b49ed140d9e38584baca7dc7492ae55 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -1852,6 +1852,12 @@ InputEventAckState RenderWidgetHostImpl::FilterInputEvent(
|
| : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
|
| }
|
|
|
| +void RenderWidgetHostImpl::OnForwardEventToRenderer(
|
| + const blink::WebInputEvent& input_event,
|
| + ui::LatencyInfo* latency_info) {
|
| + latency_tracker_.OnForwardEventToRenderer(input_event, latency_info);
|
| +}
|
| +
|
| void RenderWidgetHostImpl::IncrementInFlightEventCount() {
|
| increment_in_flight_event_count();
|
| if (!is_hidden_)
|
| @@ -1891,7 +1897,8 @@ void RenderWidgetHostImpl::DidStopFlinging() {
|
| void RenderWidgetHostImpl::OnKeyboardEventAck(
|
| const NativeWebKeyboardEventWithLatencyInfo& event,
|
| InputEventAckState ack_result) {
|
| - latency_tracker_.OnInputEventAck(event.event, &event.latency);
|
| + const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
|
| + latency_tracker_.OnInputEventAck(event.event, &event.latency, processed);
|
|
|
| #if defined(OS_MACOSX)
|
| if (!is_hidden() && view_ && view_->PostProcessEventForPluginIme(event.event))
|
| @@ -1901,7 +1908,6 @@ void RenderWidgetHostImpl::OnKeyboardEventAck(
|
| // We only send unprocessed key event upwards if we are not hidden,
|
| // because the user has moved away from us and no longer expect any effect
|
| // of this key event.
|
| - const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
|
| if (delegate_ && !processed && !is_hidden() && !event.event.skip_in_browser) {
|
| delegate_->HandleKeyboardEvent(event.event);
|
|
|
| @@ -1914,13 +1920,17 @@ void RenderWidgetHostImpl::OnKeyboardEventAck(
|
| void RenderWidgetHostImpl::OnMouseEventAck(
|
| const MouseEventWithLatencyInfo& mouse_event,
|
| InputEventAckState ack_result) {
|
| - latency_tracker_.OnInputEventAck(mouse_event.event, &mouse_event.latency);
|
| + latency_tracker_.OnInputEventAck(
|
| + mouse_event.event, &mouse_event.latency,
|
| + ack_result == INPUT_EVENT_ACK_STATE_CONSUMED);
|
| }
|
|
|
| void RenderWidgetHostImpl::OnWheelEventAck(
|
| const MouseWheelEventWithLatencyInfo& wheel_event,
|
| InputEventAckState ack_result) {
|
| - latency_tracker_.OnInputEventAck(wheel_event.event, &wheel_event.latency);
|
| + latency_tracker_.OnInputEventAck(
|
| + wheel_event.event, &wheel_event.latency,
|
| + ack_result == INPUT_EVENT_ACK_STATE_CONSUMED);
|
|
|
| if (!is_hidden() && view_) {
|
| if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED &&
|
| @@ -1934,7 +1944,9 @@ void RenderWidgetHostImpl::OnWheelEventAck(
|
| void RenderWidgetHostImpl::OnGestureEventAck(
|
| const GestureEventWithLatencyInfo& event,
|
| InputEventAckState ack_result) {
|
| - latency_tracker_.OnInputEventAck(event.event, &event.latency);
|
| + latency_tracker_.OnInputEventAck(
|
| + event.event, &event.latency,
|
| + ack_result == INPUT_EVENT_ACK_STATE_CONSUMED);
|
|
|
| if (view_)
|
| view_->GestureEventAck(event.event, ack_result);
|
| @@ -1943,7 +1955,9 @@ void RenderWidgetHostImpl::OnGestureEventAck(
|
| void RenderWidgetHostImpl::OnTouchEventAck(
|
| const TouchEventWithLatencyInfo& event,
|
| InputEventAckState ack_result) {
|
| - latency_tracker_.OnInputEventAck(event.event, &event.latency);
|
| + latency_tracker_.OnInputEventAck(
|
| + event.event, &event.latency,
|
| + ack_result == INPUT_EVENT_ACK_STATE_CONSUMED);
|
|
|
| if (touch_emulator_ &&
|
| touch_emulator_->HandleTouchEventAck(event.event, ack_result)) {
|
|
|