[NOT FOR COMMIT] Hacks to merge render compositor thread with UI thread

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/common/aw_switches.h"
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
 #include "android_webview/native/aw_geolocation_permission_context.h"
@@ skipping 15 matching lines @@
 AwMainDelegate::~AwMainDelegate() {
 }
 
 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   content::SetContentClient(&content_client_);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   // Set the command line to enable synchronous API compatibility.
   command_line->AppendSwitch(switches::kEnableWebViewSynchronousAPIs);
 
+  // Merge browser UI and renderer compositor threads.
+  command_line->AppendSwitch(switches::kMergeUIAndRendererCompositorThreads);
+
   return false;
 }
 
 void AwMainDelegate::PreSandboxStartup() {
   // TODO(torne): When we have a separate renderer process, we need to handle
   // being passed open FDs for the resource paks here.
 }
 
 void AwMainDelegate::SandboxInitialized(const std::string& process_type) {
   // TODO(torne): Adjust linux OOM score here.
@@ skipping 29 matching lines @@
   return content_browser_client_.get();
 }
 
 content::ContentRendererClient*
     AwMainDelegate::CreateContentRendererClient() {
   MessageLoop* renderer_compositor_loop = NULL;
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kMergeUIAndRendererCompositorThreads)) {
     renderer_compositor_loop =
         content::BrowserThread::UnsafeGetMessageLoopForThread(

[boliu, 2013/03/07 18:28:26]

Just realized this has been returning null since code runs before any message
loops are started.

AFAICT this has always been the case, although I swear it was triggering
ThreadRestriction checks on the UI thread when I was hacking this...

Going to look for a better (ie functional) way to do this

[boliu, 2013/03/07 19:04:45]

Fix here: crrev.com/12639002

             content::BrowserThread::UI);
   }
 
   content_renderer_client_.reset(
       new AwContentRendererClient(renderer_compositor_loop));
   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