HW draw workarounds

android_webview/lib/main/aw_main_delegate.cc

Index: android_webview/lib/main/aw_main_delegate.cc
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index fae9f35fd0cff6808787833d68f7f22ed7998d3d..2985e3bdce3ff065eb4e36a5b02939f0b4fce98d 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -18,6 +18,7 @@
 #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"
@@ -56,17 +57,12 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
 
   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;
 }