Move compositor InputHandler from RenderViewImpl to RenderWidget.

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 264 matching lines @@
 // state and scroll position) to the browser. We delay sending changes to avoid
 // spamming the browser.
 // To avoid having tab/session restore require sending a message to get the
 // current content state during tab closing we use a shorter timeout for the
 // foreground renderer. This means there is a small window of time from which
 // content state is modified and not sent to session restore, but this is
 // better than having to wake up all renderers during shutdown.
 const int kDelaySecondsForContentStateSyncHidden = 5;
 const int kDelaySecondsForContentStateSync = 1;
 
-#if defined(OS_ANDROID)
-// Delay between tapping in content and launching the associated android intent.
-// Used to allow users see what has been recognized as content.
-const size_t kContentIntentDelayMilliseconds = 700;
-#endif
-
 static RenderViewImpl* (*g_create_render_view_impl)(
     CompositorDependencies* compositor_deps,
     const mojom::CreateViewParams&) = nullptr;
 
 // static
 Referrer RenderViewImpl::GetReferrerFromRequest(
     WebFrame* frame,
     const WebURLRequest& request) {
   return Referrer(
       blink::WebStringToGURL(request.httpHeaderField(
@@ skipping 382 matching lines @@
       webview_(nullptr),
       has_scrolled_focused_editable_node_into_rect_(false),
       page_zoom_level_(params.page_zoom_level),
       main_render_frame_(nullptr),
       frame_widget_(nullptr),
       speech_recognition_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       expected_content_intent_id_(0),
 #endif
       enumeration_completion_id_(0),
-      session_storage_namespace_id_(params.session_storage_namespace_id),
-      has_added_input_handler_(false) {
+      session_storage_namespace_id_(params.session_storage_namespace_id) {
   GetWidget()->set_owner_delegate(this);
 }
 
 void RenderViewImpl::Initialize(const mojom::CreateViewParams& params,
                                 bool was_created_by_renderer) {
   SetRoutingID(params.view_id);
 
   int opener_view_routing_id;
   WebFrame* opener_frame = RenderFrameImpl::ResolveOpener(
       params.opener_frame_route_id, &opener_view_routing_id);
@@ skipping 1276 matching lines @@
   // TODO(estade): hit test the event against focused node to make sure
   // the tap actually hit the focused node.
   blink::WebTextInputType text_input_type = GetWebView()->textInputType();
 
   Send(new ViewHostMsg_FocusedNodeTouched(
       GetRoutingID(), text_input_type != blink::WebTextInputTypeNone));
 #endif
 }
 
 void RenderViewImpl::initializeLayerTreeView() {
+  // TODO(!wjmaclean): We should be able to just remove this function, and
+  // expect the RenderWidget version of the function to be called instead.

[Avi (use Gerrit), 2016/11/07 16:15:55]

Soon. Soon. 🤞

[wjmaclean, 2016/11/07 17:43:17]

Acknowledged.

+  // However, we have a diamond inheritance pattern going on:
+  //       WebWidgetClient
+  //         |          |
+  //  RenderWidget    WebViewClient
+  //           |        |
+  //        RenderViewImpl
+  //
+  // and this seems to prefer calling the empty version in WebWidgetClient
+  // or WebViewClient over the non-empty one in RenderWidget.
   RenderWidget::initializeLayerTreeView();
-  RenderWidgetCompositor* rwc = compositor();
-  if (!rwc)
-    return;
-
-  bool use_threaded_event_handling = true;
-#if defined(OS_MACOSX)
-  // Disable threaded event handling if content is not handling the elastic
-  // overscroll effect. This includes the cases where the elastic overscroll
-  // effect is being handled by Blink (because of command line flags) and older
-  // operating system versions which do not have an elastic overscroll effect
-  // (SnowLeopard, which has Aqua scrollbars which need synchronous updates).
-  use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled();
-#endif
-  if (!use_threaded_event_handling)
-    return;
-
-  RenderThreadImpl* render_thread = RenderThreadImpl::current();
-  // render_thread may be NULL in tests.
-  InputHandlerManager* input_handler_manager =
-      render_thread ? render_thread->input_handler_manager() : NULL;
-  if (input_handler_manager) {
-    input_handler_manager->AddInputHandler(
-        GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),
-        webkit_preferences_.enable_scroll_animator);
-    has_added_input_handler_ = true;
-  }
 }
 
 void RenderViewImpl::closeWidgetSoon() {
   RenderWidget::closeWidgetSoon();
 }
 
 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) {
   RenderWidget::convertViewportToWindow(rect);
 }
 
@@ skipping 701 matching lines @@
     WebURL intent = detector->FindTappedContent(touch_hit);
     if (intent.isValid()) {
       return intent;
     }
   }
   return WebURL();
 }
 
 void RenderViewImpl::scheduleContentIntent(const WebURL& intent,
                                            bool is_main_frame) {
-  // Introduce a short delay so that the user can notice the content.
-  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&RenderViewImpl::LaunchAndroidContentIntent, AsWeakPtr(),
-                 intent, expected_content_intent_id_, is_main_frame),
-      base::TimeDelta::FromMilliseconds(kContentIntentDelayMilliseconds));
+  scheduleContentIntentForRenderView(intent, is_main_frame,
+                                     expected_content_intent_id_);
 }
 
 void RenderViewImpl::cancelScheduledContentIntents() {
   ++expected_content_intent_id_;
 }
 
 void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent,
                                                 size_t request_id,
                                                 bool is_main_frame) {
   if (request_id != expected_content_intent_id_)
@@ skipping 240 matching lines @@
     NotifyInputEventHandled(input_event->type,
                             INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   }
 
   std::unique_ptr<InputEventAck> ack(
       new InputEventAck(input_event->type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
   OnInputEventAck(std::move(ack));
 }
 
 }  // namespace content