Enable webgl and accelerated compositing by default on all platforms. Removes

--enable-webgl and --enable-accelerated-compositing flags and replaces them by
--disable-webgl and --disable-accelerated-compositing. This CL is practically identical
to:
http://src.chromium.org/viewvc/chrome?view=rev&revision=58711

which was checked in the later reverted in:

http://src.chromium.org/viewvc/chrome?view=rev&revision=58730 

due to UI test failures related to video playback via the compositor. The main difference
is that mac is no longer excluded so the two features are now turned on on all 3 platforms.

The issue with the failing UI tests was corrected upstream in WebKit:
http://trac.webkit.org/changeset/66923

so this WebKit change must be rolled in before the chromium change lands.

BUG=54469
TEST=NONE


Review URL: http://codereview.chromium.org/3348012

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

4 files changed, 11 insertions, 10 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 4c916d3..74ef4ca 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -117,6 +117,10 @@ const char kDebugPrint[]                    = "debug-print";
 // Triggers a pletora of diagnostic modes.
 const char kDiagnostics[]                   = "diagnostics";
 
+// Disables accelerated compositing.
+const char kDisableAcceleratedCompositing[] =
+    "disable-accelerated-compositing";
+
 // Disables the alternate window station for the renderer.
 const char kDisableAltWinstation[]          = "disable-winsta";
 
@@ -174,6 +178,9 @@ const char kDisableDevTools[]               = "disable-dev-tools";
 // Disables device orientation events.
 const char kDisableDeviceOrientation[]      = "disable-device-orientation";
 
+// Disable experimental WebGL support.
+const char kDisableExperimentalWebGL[]      = "disable-webgl";
+
 // Disable extensions.
 const char kDisableExtensions[]             = "disable-extensions";
 
@@ -340,9 +347,6 @@ const char kDumpHistogramsOnExit[]          = "dump-histograms-on-exit";
 // Enable displaying net log events on the command line.
 extern const char kLogNetLog[]              = "log-net-log";
 
-// Enable gpu-accelerated compositing.
-const char kEnableAcceleratedCompositing[]  = "enable-accelerated-compositing";
-
 // Enable gpu-accelerated 2d canvas.
 const char kEnableAccelerated2dCanvas[]     = "enable-accelerated-2d-canvas";
 
@@ -393,9 +397,6 @@ const char kEnableDNSSECCerts[]             = "enable-dnssec-certs";
 const char kEnableExperimentalExtensionApis[] =
     "enable-experimental-extension-apis";
 
-// Enable experimental WebGL support.
-const char kEnableExperimentalWebGL[]       = "enable-webgl";
-
 // Enable experimental timeline API.
 const char kEnableExtensionTimelineApi[]    = "enable-extension-timeline-api";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 74bec36..82417c4 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -47,6 +47,7 @@ extern const char kCloudPrintServiceURL[];
 extern const char kCountry[];
 extern const char kDebugPrint[];
 extern const char kDiagnostics[];
+extern const char kDisableAcceleratedCompositing[];
 extern const char kDisableAltWinstation[];
 extern const char kDisableApplicationCache[];
 extern const char kDisableApps[];
@@ -62,6 +63,7 @@ extern const char kDisableDatabases[];
 extern const char kDisableDesktopNotifications[];
 extern const char kDisableDevTools[];
 extern const char kDisableDeviceOrientation[];
+extern const char kDisableExperimentalWebGL[];
 extern const char kDisableExtensions[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableGeolocation[];
@@ -108,7 +110,6 @@ extern const char kDnsLogDetails[];
 extern const char kDnsPrefetchDisable[];
 extern const char kDomAutomationController[];
 extern const char kDumpHistogramsOnExit[];
-extern const char kEnableAcceleratedCompositing[];
 extern const char kEnableAccelerated2dCanvas[];
 extern const char kEnableAeroPeekTabs[];
 extern const char kEnableAuthNegotiatePort[];
@@ -123,7 +124,6 @@ extern const char kEnableCookiePrompt[];
 extern const char kEnableDeviceMotion[];
 extern const char kEnableDNSSECCerts[];
 extern const char kEnableExperimentalExtensionApis[];
-extern const char kEnableExperimentalWebGL[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc
index d3017b7..ca21255 100644
--- a/chrome/common/sandbox_init_wrapper_mac.cc
+++ b/chrome/common/sandbox_init_wrapper_mac.cc
@@ -22,7 +22,7 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
     // Browser process isn't sandboxed.
     return true;
   } else if (process_type == switches::kRendererProcess) {
-    if (command_line.HasSwitch(switches::kEnableExperimentalWebGL) &&
+    if (!command_line.HasSwitch(switches::kDisableExperimentalWebGL) &&
         command_line.HasSwitch(switches::kInProcessWebGL)) {
       // TODO(kbr): this check seems to be necessary only on this
       // platform because the sandbox is initialized later. Remove
diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc
index e772fc9..dd9996c 100644
--- a/chrome/common/sandbox_policy.cc
+++ b/chrome/common/sandbox_policy.cc
@@ -460,7 +460,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
     in_sandbox = false;
   }
 #endif
-  if (browser_command_line.HasSwitch(switches::kEnableExperimentalWebGL) &&
+  if (!browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL) &&
       browser_command_line.HasSwitch(switches::kInProcessWebGL)) {
     // In process WebGL won't work if the sandbox is enabled.
     in_sandbox = false;