Move synchronous compositor into content/browser

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 <vector>
@@ skipping 100 matching lines @@
 #endif
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "content/renderer/android/synchronous_compositor_factory.h"
+#endif
+
 using base::ThreadRestrictions;
 using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebNetworkStateNotifier;
 using WebKit::WebRuntimeFeatures;
 using WebKit::WebScriptController;
 using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 using WebKit::WebView;
 
@@ skipping 606 matching lines @@
   WebKit::initialize(webkit_platform_support_.get());
   WebKit::setSharedWorkerRepository(
       webkit_platform_support_.get()->sharedWorkerRepository());
   WebKit::setIDBFactory(
       webkit_platform_support_.get()->idbFactory());
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   bool enable = command_line.HasSwitch(switches::kEnableThreadedCompositing);
   if (enable) {
-    base::MessageLoop* override_loop =
-        GetContentClient()->renderer()->OverrideCompositorMessageLoop();
-    if (override_loop) {
-      compositor_message_loop_proxy_ = override_loop->message_loop_proxy();
-    } else {
+#if defined(OS_ANDROID)
+    if (SynchronousCompositorFactory* factory =
+        SynchronousCompositorFactory::GetInstance())
+      compositor_message_loop_proxy_ =
+          factory->GetCompositorMessageLoop();
+#endif
+    if (!compositor_message_loop_proxy_) {
       compositor_thread_.reset(new base::Thread("Compositor"));
       compositor_thread_->Start();
 #if defined(OS_ANDROID)
       compositor_thread_->SetPriority(base::kThreadPriority_Display);
 #endif
       compositor_message_loop_proxy_ =
           compositor_thread_->message_loop_proxy();
       compositor_message_loop_proxy_->PostTask(
           FROM_HERE,
           base::Bind(base::IgnoreResult(&ThreadRestrictions::SetIOAllowed),
                      false));
     }
 
-    if (GetContentClient()->renderer()->ShouldCreateCompositorInputHandler()) {
-      input_handler_manager_.reset(
-          new InputHandlerManager(this, compositor_message_loop_proxy_));
-      AddFilter(input_handler_manager_->GetMessageFilter());
-    }
+    input_handler_manager_.reset(
+        new InputHandlerManager(this, compositor_message_loop_proxy_));
+    AddFilter(input_handler_manager_->GetMessageFilter());
   }
 
   scoped_refptr<base::MessageLoopProxy> output_surface_loop;
   if (enable)
     output_surface_loop = compositor_message_loop_proxy_;
   else
     output_surface_loop = base::MessageLoopProxy::current();
 
   compositor_output_surface_filter_ =
       CompositorOutputSurface::CreateFilter(output_surface_loop);
@@ skipping 547 matching lines @@
 
 void RenderThreadImpl::SetFlingCurveParameters(
     const std::vector<float>& new_touchpad,
     const std::vector<float>& new_touchscreen) {
   webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
                                                     new_touchscreen);
 
 }
 
 }  // namespace content