Allow MainThreadEventQueue to call the RenderWidget directly.

content/renderer/render_view_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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 707 matching lines @@
 
   UpdateWebViewWithDeviceScaleFactor();
   OnSetRendererPrefs(params.renderer_preferences);
 
   if (!params.enable_auto_resize) {
     OnResize(params.initial_size);
   } else {
     OnEnableAutoResize(params.min_size, params.max_size);
   }
 
-  new IdleUserDetector(this);
+  idle_user_detector_.reset(new IdleUserDetector(this));
 
   GetContentClient()->renderer()->RenderViewCreated(this);
 
   // Ensure that sandbox flags are inherited from an opener in a different
   // process.  In that case, the browser process will set any inherited sandbox
   // flags in |replicated_frame_state|, so apply them here.
   if (!was_created_by_renderer && webview()->MainFrame()->IsWebLocalFrame()) {
     webview()->MainFrame()->ToWebLocalFrame()->ForceSandboxFlags(
         params.replicated_frame_state.sandbox_flags);
   }
@@ skipping 19 matching lines @@
   // Make sure we are no longer referenced by the ViewMap or RoutingIDViewMap.
   ViewMap* views = g_view_map.Pointer();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
     DCHECK_NE(this, it->second) << "Failed to call Close?";
   RoutingIDViewMap* routing_id_views = g_routing_id_view_map.Pointer();
   for (RoutingIDViewMap::iterator it = routing_id_views->begin();
        it != routing_id_views->end(); ++it)
     DCHECK_NE(this, it->second) << "Failed to call Close?";
 #endif
 
+  idle_user_detector_.reset();
   for (auto& observer : observers_)
     observer.RenderViewGone();
   for (auto& observer : observers_)
     observer.OnDestruct();
 }
 
 /*static*/
 RenderViewImpl* RenderViewImpl::FromWebView(WebView* webview) {
   ViewMap* views = g_view_map.Pointer();
   ViewMap::iterator it = views->find(webview);
@@ skipping 1878 matching lines @@
   }
   webview()->GetSettings()->SetPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
 }
 
 void RenderViewImpl::OnDiscardInputEvent(
     const blink::WebInputEvent* input_event,
     const std::vector<const blink::WebInputEvent*>& coalesced_events,
     const ui::LatencyInfo& latency_info,
     InputEventDispatchType dispatch_type) {
-  if (!input_event || (dispatch_type != DISPATCH_TYPE_BLOCKING &&
-                       dispatch_type != DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN)) {
+  if (!input_event || dispatch_type == DISPATCH_TYPE_NON_BLOCKING) {
     return;
   }
 
-  if (dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN) {
-    NotifyInputEventHandled(input_event->GetType(),
-                            blink::WebInputEventResult::kNotHandled,
-                            INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
-  }
-
   std::unique_ptr<InputEventAck> ack(new InputEventAck(
       InputEventAckSource::MAIN_THREAD, input_event->GetType(),
       INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
   OnInputEventAck(std::move(ack));
 }
 
+InputEventAckState RenderViewImpl::HandleInputEvent(
+    const blink::WebCoalescedInputEvent& input_event,
+    const ui::LatencyInfo& latency_info,
+    InputEventDispatchType dispatch_type) {
+  if (is_swapped_out_) {
+    OnDiscardInputEvent(&input_event.Event(),
+                        input_event.GetCoalescedEventsPointers(), latency_info,
+                        dispatch_type);
+    return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
+  }
+  idle_user_detector_->ActivityDetected();
+  return RenderWidget::HandleInputEvent(input_event, latency_info,
+                                        dispatch_type);
+}
+
 }  // namespace content