aw: Ubercomp mega patch

android_webview/browser/aw_browser_main_parts.cc

Index: android_webview/browser/aw_browser_main_parts.cc
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 653f8c5f90816c7d1c6d1554ebdfe84fb7244c6d..0b04715432475848c3417c93e9efee598dabe95f 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -6,6 +6,7 @@
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_result_codes.h"
+#include "android_webview/common/aw_switches.h"
 #include "base/android/build_info.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/command_line.h"
@@ -62,9 +63,13 @@ int AwBrowserMainParts::PreCreateThreads() {
 }
 
 void AwBrowserMainParts::PreMainMessageLoopRun() {
-  if (!gpu::gles2::MailboxSynchronizer::Initialize()) {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kDisableAccelerated2dCanvas);
+  // TODO(boliu): Can't support accelerated 2d canvas and WebGL with ubercomp
+  // yet: crbug.com/352424.
+  if (!switches::UbercompEnabled() &&
+      !gpu::gles2::MailboxSynchronizer::Initialize()) {
+    CommandLine* cl = CommandLine::ForCurrentProcess();
+    cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
+    cl->AppendSwitch(switches::kDisableExperimentalWebGL);
   }
 
   browser_context_->PreMainMessageLoopRun();