Android WebView Merged-Thread Hardware Draw

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 "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 namespace android_webview {
 
 namespace {
 
+// TODO(boliu): Remove these global Allows once the underlying issues
+// are resolved. See AwMainDelegate::RunProcess below.
+
 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> >
     g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER;
 
+base::LazyInstance<scoped_ptr<base::ThreadRestrictions::ScopedAllowIO> >
+    g_allow_io_in_ui_thread = LAZY_INSTANCE_INITIALIZER;
+
 bool UIAndRendererCompositorThreadsNotMerged() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kNoMergeUIAndRendererCompositorThreads);
 }
 }
 
 AwMainDelegate::AwMainDelegate() {
 }
 
 AwMainDelegate::~AwMainDelegate() {
@@ skipping 27 matching lines @@
 int AwMainDelegate::RunProcess(
     const std::string& process_type,
     const content::MainFunctionParams& main_function_params) {
   if (process_type.empty()) {
     AwBrowserDependencyFactoryImpl::InstallInstance();
 
     browser_runner_.reset(content::BrowserMainRunner::Create());
     int exit_code = browser_runner_->Initialize(main_function_params);
     DCHECK(exit_code < 0);
 
-    // This is temporary until we remove the browser compositor
     if (!UIAndRendererCompositorThreadsNotMerged()) {
+      // This is temporary until we remove the browser compositor
       g_allow_wait_in_ui_thread.Get().reset(
-          new ScopedAllowWaitForLegacyWebViewApi());
+          new ScopedAllowWaitForLegacyWebViewApi);
+
+      // TODO(boliu): This is a HUGE hack to work around the fact that
+      // cc::WorkerPool joins on worker threads on the UI thread.
+      // See crbug.com/239423.
+      g_allow_io_in_ui_thread.Get().reset(
+          new base::ThreadRestrictions::ScopedAllowIO);
     }
 
     // Return 0 so that we do NOT trigger the default behavior. On Android, the
     // UI message loop is managed by the Java application.
     return 0;
   }
 
   return -1;
 }
 
@@ skipping 32 matching lines @@
         AwBrowserContext* browser_context) {
   return AwGeolocationPermissionContext::Create(browser_context);
 }
 
 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
     content::WebContents* web_contents) {
   return AwWebContentsViewDelegate::Create(web_contents);
 }
 
 }  // namespace android_webview