Disable WebGL on Android by default (but allow it to be enabled)

WebGL can run on Android but we need to assess how robust and secure
it is. This patch adds an --enable-experimental-webgl flag to allow
us to run conformance tests on various devices.

BUG=138958
TEST=Manual testing with flag, no change if flag is not used


Review URL: https://chromiumcodereview.appspot.com/10830011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148368 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/gpu_util.cc

@@ -332,7 +332,11 @@ Value* GetFeatureStatus() {
       {
           "webgl",
           flags & content::GPU_FEATURE_TYPE_WEBGL,
+#if defined(OS_ANDROID)
+          !command_line.HasSwitch(switches::kEnableExperimentalWebGL),
+#else
           command_line.HasSwitch(switches::kDisableExperimentalWebGL),
+#endif
           "WebGL has been disabled, either via about:flags or command line.",
           false
       },
@@ -577,7 +581,11 @@ void UpdateStats() {
   const bool kGpuFeatureUserFlags[] = {
       command_line.HasSwitch(switches::kDisableAccelerated2dCanvas),
       command_line.HasSwitch(switches::kDisableAcceleratedCompositing),
+#if defined(OS_ANDROID)
+      !command_line.HasSwitch(switches::kEnableExperimentalWebGL)
+#else
       command_line.HasSwitch(switches::kDisableExperimentalWebGL)
+#endif
   };
 #if defined(OS_WIN)
   const std::string kGpuBlacklistFeatureHistogramNamesWin[] = {

content/browser/android/content_startup_flags.cc

@@ -108,9 +108,6 @@ void SetContentCommandLineFlags(int max_render_process_count,
   // standalone process.
   parsed_command_line->AppendSwitch(switches::kInProcessGPU);
 
-  // Disable WebGL for now (See http://b/5634125)
-  parsed_command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
-
   // Always use fixed layout and viewport tag.
   parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
   parsed_command_line->AppendSwitch(switches::kEnableViewport);

content/browser/gpu/gpu_data_manager_impl.cc

@@ -164,8 +164,10 @@ void GpuDataManagerImpl::AppendRendererCommandLine(
 
   uint32 flags = GetGpuFeatureType();
   if ((flags & content::GPU_FEATURE_TYPE_WEBGL)) {
+#if !defined(OS_ANDROID)
     if (!command_line->HasSwitch(switches::kDisableExperimentalWebGL))
       command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
+#endif
     if (!command_line->HasSwitch(switches::kDisablePepper3dForUntrustedUse))
       command_line->AppendSwitch(switches::kDisablePepper3dForUntrustedUse);
   }

content/browser/web_contents/web_contents_impl.cc

@@ -434,7 +434,11 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
   prefs.experimental_webgl_enabled =
       GpuProcessHost::gpu_enabled() &&
       !command_line.HasSwitch(switches::kDisable3DAPIs) &&
+#if defined(OS_ANDROID)
+      command_line.HasSwitch(switches::kEnableExperimentalWebGL);
+#else
       !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
+#endif
 
   prefs.flash_3d_enabled =
       GpuProcessHost::gpu_enabled() &&

content/public/common/content_switches.cc

@@ -86,8 +86,13 @@ const char kDisableDesktopNotifications[]   = "disable-desktop-notifications";
 // Disables device orientation events.
 const char kDisableDeviceOrientation[]      = "disable-device-orientation";
 
+#if defined(OS_ANDROID)
+// WebGL is disabled by default on Android.
+const char kEnableExperimentalWebGL[]       = "enable-webgl";
+#else
 // Disable experimental WebGL support.
 const char kDisableExperimentalWebGL[]      = "disable-webgl";
+#endif
 
 // Blacklist the GPU for accelerated compositing.
 const char kBlacklistAcceleratedCompositing[] =

content/public/common/content_switches.h

@@ -37,7 +37,11 @@ extern const char kDisableDataTransferItems[];
 CONTENT_EXPORT extern const char kDisableDeferred2dCanvas[];
 extern const char kDisableDesktopNotifications[];
 CONTENT_EXPORT extern const char kDisableDeviceOrientation[];
+#if defined(OS_ANDROID)
+CONTENT_EXPORT extern const char kEnableExperimentalWebGL[];
+#else
 CONTENT_EXPORT extern const char kDisableExperimentalWebGL[];
+#endif
 CONTENT_EXPORT extern const char kBlacklistAcceleratedCompositing[];
 CONTENT_EXPORT extern const char kBlacklistWebGL[];
 extern const char kDisableFileSystem[];