summaryrefslogtreecommitdiffstats
path: root/content/shell/common
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 02:46:22 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 02:46:22 +0000
commitebc0e1dfdf04993d73087a92d3584b82936e15d2 (patch)
tree6fe976dcaaef63c7bb285506206f41e88f405aad /content/shell/common
parent9ee0d98ec72e8ac96dd2d86de5b1746baa18bb50 (diff)
downloadchromium_src-ebc0e1dfdf04993d73087a92d3584b82936e15d2.zip
chromium_src-ebc0e1dfdf04993d73087a92d3584b82936e15d2.tar.gz
chromium_src-ebc0e1dfdf04993d73087a92d3584b82936e15d2.tar.bz2
Add a flag to allow renderer to use software compositor when GL compositor doesn't work.
The --enable-software-compositing flag will allow the renderer to use the software compositor if it can't create a GL context. This is currently accomplished by having the compositor request a "fallback" output surface if the normal output surface can't be initialized (on the impl thread). BUG=229712,230120 Review URL: https://chromiumcodereview.appspot.com/19267016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/common')
-rw-r--r--content/shell/common/shell_switches.cc3
-rw-r--r--content/shell/common/shell_switches.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/content/shell/common/shell_switches.cc b/content/shell/common/shell_switches.cc
index d4f25c3..81a4a68 100644
--- a/content/shell/common/shell_switches.cc
+++ b/content/shell/common/shell_switches.cc
@@ -24,9 +24,6 @@ const char kDumpRenderTree[] = "dump-render-tree";
// Enable accelerated 2D canvas.
const char kEnableAccelerated2DCanvas[] = "enable-accelerated-2d-canvas";
-// Alias for kEnableSoftwareCompositingGLAdapter.
-const char kEnableSoftwareCompositing[] = "enable-software-compositing";
-
// Encode binary layout test results (images, audio) using base64.
const char kEncodeBinary[] = "encode-binary";
diff --git a/content/shell/common/shell_switches.h b/content/shell/common/shell_switches.h
index 8d45e05..36474a7 100644
--- a/content/shell/common/shell_switches.h
+++ b/content/shell/common/shell_switches.h
@@ -15,7 +15,6 @@ extern const char kContentBrowserTest[];
extern const char kContentShellDataPath[];
extern const char kDumpRenderTree[];
extern const char kEnableAccelerated2DCanvas[];
-extern const char kEnableSoftwareCompositing[];
extern const char kEncodeBinary[];
extern const char kExposeInternalsForTesting[];
extern const char kOutputLayoutTestDifferences[];