Merge 63535 - Disable GPU features AcceleratingCompositing and WebGL by defau...

chrome/browser/about_flags.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 115 matching lines @@
     kOsWin,
     switches::kEnableCloudPrintProxy
   },
   {
     "match-preview",  // Do not change; see above.
     IDS_FLAGS_INSTANT_NAME,
     IDS_FLAGS_INSTANT_DESCRIPTION,
     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,
     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,
   //  kOsAll,
   //  switches::kEnablePrintPreview
   //}
 };
 
 // Stores and encapsulates the little state that about:flags has.
@@ skipping 224 matching lines @@
 
 } // namespace
 
 namespace testing {
 void ClearState() {
   FlagsState::instance()->reset();
 }
 }  // namespace testing
 
 }  // namespace about_flags