Add a flag to allow renderer to use software compositor when GL compositor doesn't work.

content/public/common/content_switches.cc

 // Copyright (c) 2012 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 "content/public/common/content_switches.h"
 
 namespace switches {
 
 // By default, file:// URIs cannot read other file:// URIs. This is an
 // override for developers who need the old behavior for testing.
@@ skipping 497 matching lines @@
 // testing changes locally. The argument is a list of name and value pairs,
 // separated by slashes. See FieldTrialList::CreateTrialsFromString() in
 // field_trial.h for details.
 const char kForceFieldTrials[]              = "force-fieldtrials";
 
 // Force renderer accessibility to be on instead of enabling it on demand when
 // a screen reader is detected. The disable-renderer-accessibility switch
 // overrides this if present.
 const char kForceRendererAccessibility[]    = "force-renderer-accessibility";
 
-// Force the compositor to use its software implementation instead of GL.
-const char kEnableSoftwareCompositingGLAdapter[] =
-    "enable-software-compositing-gl-adapter";
+// Allow the compositor to use its software implementation if GL fails.
+const char kEnableSoftwareCompositing[] = "enable-software-compositing";
+
+// Prevent the compositor from using its GPU implementation.
+const char kDisableGpuCompositing[] = "disable-gpu-compositing";
 
 // Passes gpu device_id from browser process to GPU process.
 const char kGpuDeviceID[]                   = "gpu-device-id";
 
 // Passes gpu driver_vendor from browser process to GPU process.
 const char kGpuDriverVendor[]               = "gpu-driver-vendor";
 
 // Passes gpu driver_version from browser process to GPU process.
 const char kGpuDriverVersion[]              = "gpu-driver-version";
 
@@ skipping 369 matching lines @@
 const char kEnableWebGLDraftExtensions[] = "enable-webgl-draft-extensions";
 
 // Enables/disables accelerated compositing for backgrounds of root layers with
 // background-attachment: fixed. Requires kForceCompositingMode.
 const char kDisableAcceleratedFixedRootBackground[] =
     "disable-accelerated-fixed-root-background";
 const char kEnableAcceleratedFixedRootBackground[] =
     "enable-accelerated-fixed-root-background";
 
 }  // namespace switches