Allow MainThreadEventQueue to call the RenderWidget directly.

content/renderer/input/input_handler_manager.cc

 // Copyright 2013 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/input/input_handler_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 51 matching lines @@
   client_->SetInputHandlerManager(this);
 }
 
 InputHandlerManager::~InputHandlerManager() {
   client_->SetInputHandlerManager(nullptr);
 }
 
 void InputHandlerManager::AddInputHandler(
     int routing_id,
     const base::WeakPtr<cc::InputHandler>& input_handler,
+    const scoped_refptr<MainThreadEventQueue>& input_event_queue,
     const base::WeakPtr<RenderWidget>& render_widget,
     bool enable_smooth_scrolling) {
   if (task_runner_->BelongsToCurrentThread()) {
     AddInputHandlerOnCompositorThread(
         routing_id, base::ThreadTaskRunnerHandle::Get(), input_handler,
-        render_widget, enable_smooth_scrolling);
+        input_event_queue, render_widget, enable_smooth_scrolling);
   } else {
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&InputHandlerManager::AddInputHandlerOnCompositorThread,
                    base::Unretained(this), routing_id,
                    base::ThreadTaskRunnerHandle::Get(), input_handler,
-                   render_widget, enable_smooth_scrolling));
+                   input_event_queue, render_widget, enable_smooth_scrolling));
   }
 }
 
 void InputHandlerManager::AddInputHandlerOnCompositorThread(
     int routing_id,
     const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
     const base::WeakPtr<cc::InputHandler>& input_handler,
+    const scoped_refptr<MainThreadEventQueue>& input_event_queue,
     const base::WeakPtr<RenderWidget>& render_widget,
     bool enable_smooth_scrolling) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // The handler could be gone by this point if the compositor has shut down.
   if (!input_handler)
     return;
 
   // The same handler may be registered for a route multiple times.
   if (input_handlers_.count(routing_id) != 0)
     return;
 
   TRACE_EVENT1("input",
       "InputHandlerManager::AddInputHandlerOnCompositorThread",
       "result", "AddingRoute");
   std::unique_ptr<InputHandlerWrapper> wrapper(
       new InputHandlerWrapper(this, routing_id, main_task_runner, input_handler,
                               render_widget, enable_smooth_scrolling));
-  client_->RegisterRoutingID(routing_id);
+  client_->RegisterRoutingID(routing_id, input_event_queue);
   if (synchronous_handler_proxy_client_) {
     synchronous_handler_proxy_client_->DidAddSynchronousHandlerProxy(
         routing_id, wrapper->input_handler_proxy());
   }
   input_handlers_[routing_id] = std::move(wrapper);
 }
 
 void InputHandlerManager::RemoveInputHandler(int routing_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(input_handlers_.find(routing_id) != input_handlers_.end());
@@ skipping 26 matching lines @@
 
 void InputHandlerManager::
     RegisterAssociatedRenderFrameRoutingIDOnCompositorThread(
         int render_frame_routing_id,
         int render_view_routing_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   client_->RegisterAssociatedRenderFrameRoutingID(render_frame_routing_id,
                                                   render_view_routing_id);
 }
 
-void InputHandlerManager::RegisterRoutingID(int routing_id) {
-  if (task_runner_->BelongsToCurrentThread()) {
-    RegisterRoutingIDOnCompositorThread(routing_id);
-  } else {
-    task_runner_->PostTask(
-        FROM_HERE,
-        base::Bind(&InputHandlerManager::RegisterRoutingIDOnCompositorThread,
-                   base::Unretained(this), routing_id));
-  }
-}
-
-void InputHandlerManager::RegisterRoutingIDOnCompositorThread(int routing_id) {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  client_->RegisterRoutingID(routing_id);
-}
-
 void InputHandlerManager::UnregisterRoutingID(int routing_id) {
   if (task_runner_->BelongsToCurrentThread()) {
     UnregisterRoutingIDOnCompositorThread(routing_id);
   } else {
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&InputHandlerManager::UnregisterRoutingIDOnCompositorThread,
                    base::Unretained(this), routing_id));
   }
 }
@@ skipping 23 matching lines @@
   auto it = input_handlers_.find(routing_id);
   if (it == input_handlers_.end())
     return;
 
   InputHandlerProxy* proxy = it->second->input_handler_proxy();
   DCHECK(proxy->scroll_elasticity_controller());
   proxy->scroll_elasticity_controller()->ObserveGestureEventAndResult(
       gesture_event, scroll_result);
 }
 
-void InputHandlerManager::NotifyInputEventHandledOnMainThread(
-    int routing_id,
-    blink::WebInputEvent::Type type,
-    blink::WebInputEventResult result,
-    InputEventAckState ack_result) {
-  client_->NotifyInputEventHandled(routing_id, type, result, ack_result);
-}
-
-void InputHandlerManager::ProcessRafAlignedInputOnMainThread(
-    int routing_id,
-    base::TimeTicks frame_time) {
-  client_->ProcessRafAlignedInput(routing_id, frame_time);
-}
-
 void InputHandlerManager::HandleInputEvent(
     int routing_id,
     ui::WebScopedInputEvent input_event,
     const ui::LatencyInfo& latency_info,
     const InputEventAckStateCallback& callback) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   TRACE_EVENT1("input,benchmark,rail", "InputHandlerManager::HandleInputEvent",
                "type", WebInputEvent::GetName(input_event->GetType()));
 
   auto it = input_handlers_.find(routing_id);
@@ skipping 54 matching lines @@
 }
 
 void InputHandlerManager::DidStopFlinging(int routing_id) {
   client_->DidStopFlinging(routing_id);
 }
 
 void InputHandlerManager::DidAnimateForInput() {
   renderer_scheduler_->DidAnimateForInputOnCompositorThread();
 }
 
-void InputHandlerManager::NeedsMainFrame(int routing_id) {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  auto it = input_handlers_.find(routing_id);
-  if (it == input_handlers_.end())
-    return;
-  it->second->NeedsMainFrame();
-}
-
 void InputHandlerManager::DispatchNonBlockingEventToMainThread(
     int routing_id,
     ui::WebScopedInputEvent event,
     const ui::LatencyInfo& latency_info) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event),
                                                 latency_info);
 }
 
 }  // namespace content