summaryrefslogtreecommitdiffstats
path: root/content/public/common
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-16 01:40:24 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-16 01:40:24 +0000
commit58b4b6dac3eeb9af7a3e46482552679ba3db6ed7 (patch)
tree2f11456c5cdc2dd81fadd2af7497378e99659682 /content/public/common
parent4eec71c33f6469fdec8ba5494842c1c16ab22cd5 (diff)
downloadchromium_src-58b4b6dac3eeb9af7a3e46482552679ba3db6ed7.zip
chromium_src-58b4b6dac3eeb9af7a3e46482552679ba3db6ed7.tar.gz
chromium_src-58b4b6dac3eeb9af7a3e46482552679ba3db6ed7.tar.bz2
aura: Use GPU process for UI
This is behind a flag (--ui-use-gpu-process). Currently problems occur when the GPU process crash, this will be handled in a follow-up CL. BUG=99516 TEST=chrome --ui-use-gpu-process (with an aura build) Review URL: http://codereview.chromium.org/9348117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/common')
-rw-r--r--content/public/common/content_switches.cc8
-rw-r--r--content/public/common/content_switches.h5
2 files changed, 13 insertions, 0 deletions
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 708fdd6..1e28e57 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -556,6 +556,9 @@ const char kTraceStartupFile[] = "trace-startup-file";
// --startup-trace-file=none was supplied.
const char kTraceStartupDuration[] = "trace-startup-duration";
+// Enables the use of the GPU process for UI. Only meaningful for Aura.
+const char kUIUseGPUProcess[] = "ui-use-gpu-process";
+
// A string used to override the default user agent with a custom one.
const char kUserAgent[] = "user-agent";
@@ -621,4 +624,9 @@ const char kEnablePerTilePainting[] = "enable-per-tile-painting";
// Disables the use of a 3D software rasterizer.
const char kDisableSoftwareRasterizer[] = "disable-software-rasterizer";
+#if defined(USE_AURA)
+// Forces usage of the test compositor. Needed to run ui tests on bots.
+extern const char kTestCompositor[] = "test-compositor";
+#endif
+
} // namespace switches
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 1c05a199..7f56348 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -165,6 +165,7 @@ extern const char kTouchOptimizedUI[];
extern const char kTraceStartup[];
extern const char kTraceStartupFile[];
extern const char kTraceStartupDuration[];
+extern const char kUIUseGPUProcess[];
CONTENT_EXPORT extern const char kUserAgent[];
extern const char kUtilityCmdPrefix[];
CONTENT_EXPORT extern const char kUtilityProcess[];
@@ -194,6 +195,10 @@ CONTENT_EXPORT extern const char kRendererCheckFalseTest[];
extern const char kEnablePerTilePainting[];
+#if defined(USE_AURA)
+CONTENT_EXPORT extern const char kTestCompositor[];
+#endif
+
} // namespace switches
#endif // CONTENT_PUBLIC_COMMON_CONTENT_SWITCHES_H_