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

chrome/common/chrome_switches.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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 103 matching lines @@
 // system during first run and cached in the preferences afterwards.  This is a
 // string value, the 2 letter code from ISO 3166-1.
 const char kCountry[]                       = "country";
 
 // Enables support to debug printing subsystem.
 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";
 
 // Disable the ApplicationCache.
 const char kDisableApplicationCache[]       = "disable-application-cache";
 
 // Replaces the audio IPC layer for <audio> and <video> with a mock audio
 // device, useful when using remote desktop or machines without sound cards.
 // This is temporary until we fix the underlying problem.
 //
@@ skipping 39 matching lines @@
 
 // Disables desktop notifications (default enabled on windows).
 const char kDisableDesktopNotifications[]   = "disable-desktop-notifications";
 
 // Browser flag to disable the web inspector for all renderers.
 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";
 
 // Disable checking for user opt-in for extensions that want to inject script
 // into file URLs (ie, always allow it). This is used during automated testing.
 const char kDisableExtensionsFileAccessCheck[] =
     "disable-extensions-file-access-check";
 
 // Disable FileSystem API.
 const char kDisableFileSystem[]             = "disable-file-system";
@@ skipping 159 matching lines @@
 // logging to be enabled to really do anything).  Used by developers and test
 // scripts.
 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 2d canvas.
 const char kEnableAccelerated2dCanvas[]     = "enable-accelerated-2d-canvas";
 
+// Enable gpu-accelerated compositing.
+const char kEnableAcceleratedCompositing[]  = "enable-accelerated-compositing";
+
 // Enables WebKit accessibility within the renderer process.
 const char kEnableAccessibility[]           = "enable-accessibility";
 
 // Enables AeroPeek for each tab. (This switch only works on Windows 7).
 const char kEnableAeroPeekTabs[]            = "enable-aero-peek-tabs";
 
 // Enables the application section of the new tab page.
 const char kEnableAppLauncher[]             = "enable-app-launcher";
 
 // Enable the inclusion of non-standard ports when generating the Kerberos SPN
@@ skipping 34 matching lines @@
 
 // Enables device motion events.
 const char kEnableDeviceMotion[]            = "enable-device-motion";
 
 const char kEnableDNSSECCerts[]             = "enable-dnssec-certs";
 
 // Enables extension APIs that are in development.
 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";
 
 // Enable the fastback page cache.
 const char kEnableFastback[]                = "enable-fastback";
 
 // By default, cookies are not allowed on file://. They are needed for
 // testing, for example page cycler and layout tests.  See bug 1157243.
 const char kEnableFileCookies[]             = "enable-file-cookies";
 
@@ skipping 862 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches