HW draw workarounds

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/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
@@ skipping 18 matching lines @@
 }
 
 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   content::SetContentClient(&content_client_);
 
   webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl
       ::EnableVirtualizedContext();
 
   CommandLine* cl = CommandLine::ForCurrentProcess();
 
-  // Temporarily disable merged thread mode until proper hardware init is done.
-  // Currently hardware draw with incomplete init is making invalid GL calls
-  // that is crashing in graphics driver on Nexus 7.
-  if (!cl->HasSwitch("merge-ui-and-compositor-threads"))
-    cl->AppendSwitch(switches::kNoMergeUIAndRendererCompositorThreads);
-
   if (UIAndRendererCompositorThreadsNotMerged()) {
     cl->AppendSwitch(switches::kEnableWebViewSynchronousAPIs);
   } else {
     // Set the command line to enable synchronous API compatibility.
     cl->AppendSwitch(switches::kEnableSynchronousRendererCompositor);
+    cl->AppendSwitch(switches::kEnableVsyncNotification);
   }
   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) {
@@ skipping 65 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