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

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
===================================================================
--- chrome/browser/about_flags.cc	(revision 63546)
+++ chrome/browser/about_flags.cc	(working copy)
@@ -128,28 +128,32 @@
     kOsMac,
     switches::kEnableMatchPreview
   },
+  // 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-compositing", // Do not change; see above
-    IDS_FLAGS_ACCELERATED_COMPOSITING_NAME,
-    IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION,
-    kOsAll,
-    switches::kEnableAcceleratedCompositing
-  },
-  {
     "gpu-canvas-2d", // Do not change; see above
     IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME,
     IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
     switches::kEnableAccelerated2dCanvas
   },
+  // 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
+  // }
   {
-    "webgl", // Do not change; see above
-    IDS_FLAGS_WEBGL_NAME,
-    IDS_FLAGS_WEBGL_DESCRIPTION,
-    kOsAll,
-    switches::kEnableExperimentalWebGL
-  },
-  {
     "print-preview",  // Do not change; see above
     IDS_FLAGS_PRINT_PREVIEW_NAME,
     IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,