Enable GLSL shader translator by default. With this change, Chrome's

WebGL implementation requires GLSL ES compliant shaders. Now pass
--disable-glsl-translator on command line to disable the translator.

BUG=none
TEST=ran WebGL demos

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

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

4 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index b24228f..a9af09a 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -563,7 +563,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     // information is needed very early during bringup. We prefer to
     // use the WebPreferences to set this flag on a page-by-page basis.
     switches::kEnableExperimentalWebGL,
-    switches::kEnableGLSLTranslator,
+    switches::kDisableGLSLTranslator,
     switches::kInProcessWebGL,
     switches::kEnableAcceleratedCompositing,
 #if defined(OS_MACOSX)
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9f78cb9..5293e62 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -157,6 +157,9 @@ const char kDisableExtensionsFileAccessCheck[] =
 // Suppresses support for the Geolocation javascript API.
 const char kDisableGeolocation[]            = "disable-geolocation";
 
+// Disable the GLSL translator.
+const char kDisableGLSLTranslator[]         = "disable-glsl-translator";
+
 // Suppresses hang monitor dialogs in renderer processes.
 const char kDisableHangMonitor[]            = "disable-hang-monitor";
 
@@ -363,9 +366,6 @@ const char kEnableInMemoryURLIndex[]        = "enable-in-memory-url-index";
 // This flag overrides "disable-ipv6" which appears elswhere in this file.
 const char kEnableIPv6[]                    = "enable-ipv6";
 
-// Enable the GLSL translator.
-const char kEnableGLSLTranslator[]          = "enable-glsl-translator";
-
 // Enable the GPU plugin and Pepper 3D rendering.
 const char kEnableGPUPlugin[]               = "enable-gpu-plugin";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index fec5838..fba6d71 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -59,6 +59,7 @@ extern const char kDisableDevTools[];
 extern const char kDisableExtensions[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableGeolocation[];
+extern const char kDisableGLSLTranslator[];
 extern const char kDisableHangMonitor[];
 extern const char kDisableInternalFlash[];
 extern const char kDisableIPv6[];
@@ -115,7 +116,6 @@ extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableExtensionToolstrips[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
-extern const char kEnableGLSLTranslator[];
 extern const char kEnableGPUPlugin[];
 extern const char kEnableGPURendering[];
 extern const char kEnableIndexedDatabase[];
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
index 61060b3..6d2ada2 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -64,7 +64,7 @@ bool WebGraphicsContext3DCommandBufferImpl::initialize(
     return false;
   // TODO(gman): Remove this.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kEnableGLSLTranslator)) {
+  if (command_line.HasSwitch(switches::kDisableGLSLTranslator)) {
     DisableShaderTranslation(context_);
   }
   return true;