sync compositor: Merge input path with chrome

content/renderer/render_thread_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_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 1167 matching lines @@
   // The ChildResourceMessageFilter and the ResourceDispatcher need to use the
   // same queue to ensure tasks are executed in the expected order.
   child_resource_message_filter()->SetMainThreadTaskRunner(resource_task_queue);
   resource_dispatcher()->SetMainThreadTaskRunner(resource_task_queue);
 }
 
 void RenderThreadImpl::InitializeCompositorThread() {
 #if defined(OS_ANDROID)
   SynchronousCompositorFactory* sync_compositor_factory =
       SynchronousCompositorFactory::GetInstance();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   bool using_ipc_sync_compositing =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kIPCSyncCompositing);
+      cmd_line->HasSwitch(switches::kIPCSyncCompositing);
+  bool async_input_for_sync_compositing =
+      cmd_line->HasSwitch(switches::kAsyncInputForSyncCompositor);
   DCHECK(!sync_compositor_factory || !using_ipc_sync_compositing);
 
   if (sync_compositor_factory) {
     compositor_task_runner_ =
         sync_compositor_factory->GetCompositorTaskRunner();
   }
 #endif
   if (!compositor_task_runner_.get()) {
     base::Thread::Options options;
 #if defined(OS_ANDROID)
     options.priority = base::ThreadPriority::DISPLAY;
 #endif
     compositor_thread_.reset(new WebThreadForCompositor(options));
     blink_platform_impl_->SetCompositorThread(compositor_thread_.get());
     compositor_task_runner_ = compositor_thread_->TaskRunner();
     compositor_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(base::IgnoreResult(&ThreadRestrictions::SetIOAllowed),
                    false));
   }
 
-  InputHandlerManagerClient* input_handler_manager_client = NULL;
+  InputHandlerManagerClient* input_handler_manager_client = nullptr;
+  InputHandlerManagerSyncHandlerProxyClient*
+      input_handler_manager_sync_handler_proxy_client = nullptr;
 #if defined(OS_ANDROID)
   if (using_ipc_sync_compositing) {
     sync_compositor_message_filter_ =
         new SynchronousCompositorFilter(compositor_task_runner_);
     AddFilter(sync_compositor_message_filter_.get());
-    input_handler_manager_client = sync_compositor_message_filter_.get();
+    if (!async_input_for_sync_compositing)
+      input_handler_manager_client = sync_compositor_message_filter_.get();
+    input_handler_manager_sync_handler_proxy_client =
+        sync_compositor_message_filter_.get();
   } else if (sync_compositor_factory) {
     input_handler_manager_client =
         sync_compositor_factory->GetInputHandlerManagerClient();
+    input_handler_manager_sync_handler_proxy_client =
+        sync_compositor_factory->GetInputHandlerManagerSyncHandlerProxyClient();
   }
 #endif
   if (!input_handler_manager_client) {
     scoped_refptr<InputEventFilter> compositor_input_event_filter(
         new InputEventFilter(main_input_callback_.callback(),
                              main_thread_compositor_task_runner_,
                              compositor_task_runner_));
     input_handler_manager_client = compositor_input_event_filter.get();
     input_event_filter_ = compositor_input_event_filter;
   }
   input_handler_manager_.reset(new InputHandlerManager(
       compositor_task_runner_, input_handler_manager_client,
+      input_handler_manager_sync_handler_proxy_client,
       renderer_scheduler_.get()));
 }
 
 void RenderThreadImpl::EnsureWebKitInitialized() {
   if (blink_platform_impl_)
     return;
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
@@ skipping 934 matching lines @@
 }
 
 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
   size_t erased =
       RenderThreadImpl::current()->pending_render_frame_connects_.erase(
           routing_id_);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace content