Move synchronous compositor into content/browser

android_webview/lib/main/aw_main_delegate.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 "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
-#include "android_webview/browser/in_process_renderer/in_process_renderer_client.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
 #include "android_webview/native/aw_geolocation_permission_context.h"
 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
 #include "android_webview/native/aw_web_contents_view_delegate.h"
 #include "android_webview/renderer/aw_content_renderer_client.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_restrictions.h"
 #include "cc/base/switches.h"
+#include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 namespace android_webview {
 
 namespace {
 
 // TODO(boliu): Remove these global Allows once the underlying issues are
@@ skipping 21 matching lines @@
   content::SetContentClient(&content_client_);
 
   webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl
       ::EnableVirtualizedContext();
 
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (UIAndRendererCompositorThreadsNotMerged()) {
     cl->AppendSwitch(cc::switches::kEnableCompositorFrameMessage);
     cl->AppendSwitch(switches::kEnableWebViewSynchronousAPIs);
   } else {
-    cl->AppendSwitch(switches::kEnableSynchronousRendererCompositor);
     cl->AppendSwitch(switches::kEnableVsyncNotification);
+    content::SynchronousCompositor::Init();
   }
 
   // WebView uses the existing Android View edge effect for overscroll glow.
   cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
 
   return false;
 }
 
 void AwMainDelegate::PreSandboxStartup() {
   // TODO(torne): When we have a separate renderer process, we need to handle
@@ skipping 41 matching lines @@
 }
 
 content::ContentBrowserClient*
     AwMainDelegate::CreateContentBrowserClient() {
   content_browser_client_.reset(new AwContentBrowserClient(this));
   return content_browser_client_.get();
 }
 
 content::ContentRendererClient*
     AwMainDelegate::CreateContentRendererClient() {
-  // None of this makes sense for multiprocess.
-  DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess));
-  // During transition period allow running in either threading mode; eventually
-  // only the compositor/UI thread merge mode will be supported.
-  const bool no_merge_threads = UIAndRendererCompositorThreadsNotMerged();
-  content_renderer_client_.reset(
-      no_merge_threads ? new AwContentRendererClient() :
-                         new InProcessRendererClient());
+  content_renderer_client_.reset(new AwContentRendererClient());
   return content_renderer_client_.get();
 }
 
 AwQuotaManagerBridge* AwMainDelegate::CreateAwQuotaManagerBridge(
     AwBrowserContext* browser_context) {
   return new AwQuotaManagerBridgeImpl(browser_context);
 }
 
 content::GeolocationPermissionContext*
     AwMainDelegate::CreateGeolocationPermission(
         AwBrowserContext* browser_context) {
   return AwGeolocationPermissionContext::Create(browser_context);
 }
 
 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
     content::WebContents* web_contents) {
   return AwWebContentsViewDelegate::Create(web_contents);
 }
 
 }  // namespace android_webview