Teach main thread event queue about closures.

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 111 matching lines @@
   TRACE_EVENT0("input", "InputHandlerManager::RemoveInputHandler");
 
   client_->UnregisterRoutingID(routing_id);
   if (synchronous_handler_proxy_client_) {
     synchronous_handler_proxy_client_->DidRemoveSynchronousHandlerProxy(
         routing_id);
   }
   input_handlers_.erase(routing_id);
 }
 
+void InputHandlerManager::RegisterAssociatedRenderFrameRoutingID(
+    int render_frame_routing_id,
+    int render_view_routing_id) {
+  if (task_runner_->BelongsToCurrentThread()) {
+    RegisterAssociatedRenderFrameRoutingIDOnCompositorThread(
+        render_frame_routing_id, render_view_routing_id);
+  } else {
+    task_runner_->PostTask(
+        FROM_HERE,
+        base::Bind(&InputHandlerManager::
+                       RegisterAssociatedRenderFrameRoutingIDOnCompositorThread,
+                   base::Unretained(this), render_frame_routing_id,
+                   render_view_routing_id));
+  }
+}
+
+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));
   }
 }
@@ skipping 81 matching lines @@
 
   TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent",
                "result", "EventSentToInputHandlerProxy");
   InputHandlerProxy* proxy = it->second->input_handler_proxy();
   proxy->HandleInputEventWithLatencyInfo(
       std::move(input_event), latency_info,
       base::Bind(&InputHandlerManager::DidHandleInputEventAndOverscroll,
                  weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
+void InputHandlerManager::QueueClosureForMainThreadEventQueue(
+    int routing_id,
+    const base::Closure& closure) {
+  client_->QueueClosureForMainThreadEventQueue(routing_id, closure);
+}
+
 void InputHandlerManager::DidHandleInputEventAndOverscroll(
     const InputEventAckStateCallback& callback,
     InputHandlerProxy::EventDisposition event_disposition,
     ui::WebScopedInputEvent input_event,
     const ui::LatencyInfo& latency_info,
     std::unique_ptr<ui::DidOverscrollParams> overscroll_params) {
   InputEventAckState input_event_ack_state =
       InputEventDispositionToAck(event_disposition);
   switch (input_event_ack_state) {
     case INPUT_EVENT_ACK_STATE_CONSUMED:
@@ skipping 38 matching lines @@
 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