Notify WebContentsObservers of user interactions.

content/browser/renderer_host/render_widget_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 973 matching lines @@
 
 void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
       const blink::WebMouseWheelEvent& wheel_event,
       const ui::LatencyInfo& ui_latency) {
   TRACE_EVENT2("input", "RenderWidgetHostImpl::ForwardWheelEvent",
                "dx", wheel_event.deltaX, "dy", wheel_event.deltaY);
 
   if (IgnoreInputEvents())
     return;
 
+  OnUserInput(wheel_event.type);
+
   if (touch_emulator_ && touch_emulator_->HandleMouseWheelEvent(wheel_event))
     return;
 
   MouseWheelEventWithLatencyInfo wheel_with_latency(wheel_event, ui_latency);
   latency_tracker_.OnInputEvent(wheel_event, &wheel_with_latency.latency);
   input_router_->SendWheelEvent(wheel_with_latency);
 }
 
 void RenderWidgetHostImpl::ForwardGestureEvent(
     const blink::WebGestureEvent& gesture_event) {
@@ skipping 94 matching lines @@
       suppress_next_char_events_ = true;
     return;
   }
 
   if (key_event.type == WebKeyboardEvent::Char &&
       (key_event.windowsKeyCode == ui::VKEY_RETURN ||
        key_event.windowsKeyCode == ui::VKEY_SPACE)) {
     OnUserGesture();
   }
 
+  if (key_event.type == WebKeyboardEvent::RawKeyDown)

[jdduke (slow), 2015/10/21 20:53:51]

Let's remove the explicit call here and in ForwardWheelEvent above, and instead
have a new conditional in FilterInputEvent that calls the method for the
relevant types.

[dominickn, 2015/10/26 04:14:24]

Done.

+    OnUserInput(key_event.type);
+
   // Double check the type to make sure caller hasn't sent us nonsense that
   // will mess up our key queue.
   if (!WebInputEvent::isKeyboardEventType(key_event.type))
     return;
 
   if (suppress_next_char_events_) {
     // If preceding RawKeyDown event was handled by the browser, then we need
     // suppress all Char events generated by it. Please note that, one
     // RawKeyDown event may generate multiple Char events, so we can't reset
     // |suppress_next_char_events_| until we get a KeyUp or a RawKeyDown.
@@ skipping 737 matching lines @@
   // events are being ignored in order to keep the renderer from getting
   // confused about how many touches are active.
   if (IgnoreInputEvents() && event.type != WebInputEvent::TouchCancel)
     return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
 
   if (!process_->HasConnection())
     return INPUT_EVENT_ACK_STATE_UNKNOWN;
 
   if (event.type == WebInputEvent::MouseDown ||
       event.type == WebInputEvent::GestureTapDown) {
+    OnUserInput(event.type);
     OnUserGesture();
   }
 
   return view_ ? view_->FilterInputEvent(event)
                : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 }
 
 void RenderWidgetHostImpl::IncrementInFlightEventCount() {
   increment_in_flight_event_count();
   if (!is_hidden_)
@@ skipping 318 matching lines @@
 }
 
 #if defined(OS_WIN)
 gfx::NativeViewAccessible
     RenderWidgetHostImpl::GetParentNativeViewAccessible() {
   return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL;
 }
 #endif
 
 }  // namespace content