Revert 63535 - Disable GPU features AcceleratingCompositing and WebGL by default.

(This change got checked into trunk only to get merged into M8.)

Flags have been switched to reversed logic, and about_flags.cc modified to expose these to users in GUI.

BUG=56053, 59092
TEST=Use about:flags to toggle features, confirm state with e.g. http://webglsamples.googlecode.com/hg/aquarium/aquarium.html http://webkit.org/blog-files/3d-transforms/poster-circle.html Vince's change for about:flags.

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

TBR=vangelis@chromium.org
Review URL: http://codereview.chromium.org/3974004

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

3 files changed, 22 insertions, 18 deletions

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b900631..fcbabe7 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -128,13 +128,15 @@ const Experiment kExperiments[] = {
     kOsMac,
     switches::kEnableMatchPreview
   },
-  {
-    "gpu-compositing", // Do not change; see above
-    IDS_FLAGS_ACCELERATED_COMPOSITING_NAME,
-    IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION,
-    kOsAll,
-    switches::kEnableAcceleratedCompositing
-  },
+  // FIXME(scheib): Add Flags entry for accelerated Compositing,
+  // or pull it and the strings in generated_resources.grd by Dec 2010
+  // {
+  //   "gpu-compositing", // Do not change; see above
+  //   IDS_FLAGS_ACCELERATED_COMPOSITING_NAME,
+  //   IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION,
+  //   kOsAll,
+  //   switches::kDisableAcceleratedCompositing
+  // },
   {
     "gpu-canvas-2d", // Do not change; see above
     IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME,
@@ -142,13 +144,15 @@ const Experiment kExperiments[] = {
     kOsWin | kOsLinux | kOsCrOS,
     switches::kEnableAccelerated2dCanvas
   },
-  {
-    "webgl", // Do not change; see above
-    IDS_FLAGS_WEBGL_NAME,
-    IDS_FLAGS_WEBGL_DESCRIPTION,
-    kOsAll,
-    switches::kEnableExperimentalWebGL
-  },
+  // FIXME(scheib): Add Flags entry for WebGL,
+  // or pull it and the strings in generated_resources.grd by Dec 2010
+  // {
+  //   "webgl", // Do not change; see above
+  //   IDS_FLAGS_WEBGL_NAME,
+  //   IDS_FLAGS_WEBGL_DESCRIPTION,
+  //   kOsAll,
+  //   switches::kDisableExperimentalWebGL
+  // }
   {
     "print-preview",  // Do not change; see above
     IDS_FLAGS_PRINT_PREVIEW_NAME,
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index a362c75..b7af07f 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -604,10 +604,10 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     // WebGLArray constructors on the DOMWindow visible. This
     // 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::kDisableExperimentalWebGL,
     switches::kDisableGLSLTranslator,
     switches::kInProcessWebGL,
-    switches::kEnableAcceleratedCompositing,
+    switches::kDisableAcceleratedCompositing,
 #if defined(OS_MACOSX)
     // Allow this to be set when invoking the browser and relayed along.
     switches::kEnableSandboxLogging,
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 69ae618..b94ab7d 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -280,7 +280,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     web_prefs.databases_enabled =
         !command_line.HasSwitch(switches::kDisableDatabases);
     web_prefs.experimental_webgl_enabled =
-        command_line.HasSwitch(switches::kEnableExperimentalWebGL);
+        !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
     web_prefs.site_specific_quirks_enabled =
         !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
     web_prefs.allow_file_access_from_file_urls =
@@ -288,7 +288,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     web_prefs.show_composited_layer_borders =
         command_line.HasSwitch(switches::kShowCompositedLayerBorders);
     web_prefs.accelerated_compositing_enabled =
-        command_line.HasSwitch(switches::kEnableAcceleratedCompositing);
+        !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
     web_prefs.accelerated_2d_canvas_enabled =
         command_line.HasSwitch(switches::kEnableAccelerated2dCanvas);
     web_prefs.memory_info_enabled =