diff options
author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 09:39:31 +0000 |
---|---|---|
committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 09:39:31 +0000 |
commit | 867a19f29cdfeeeaf35165aa080f9744787f40e2 (patch) | |
tree | 1322f9b1933472124a5d7a44c826c8c0e319d0ff /chrome/test/perf | |
parent | ae05490794986443731b4c7102d0f6ac6ebebb59 (diff) | |
download | chromium_src-867a19f29cdfeeeaf35165aa080f9744787f40e2.zip chromium_src-867a19f29cdfeeeaf35165aa080f9744787f40e2.tar.gz chromium_src-867a19f29cdfeeeaf35165aa080f9744787f40e2.tar.bz2 |
Do not explicitly use --force-compositing-mode in memory/throughput tests; use the default config for that platform instead.
Explicitly using --force-compositing-mode enabled FCM on bots where it is blacklisted in http://crrev.com/221643 as we decided to make the flags take precedence over the blacklist decision.
This depends on https://codereview.chromium.org/23447045/ as it would otherwise disable FCM on perf bots for Mac 10.8.
BUG=286540
Review URL: https://chromiumcodereview.appspot.com/23514071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
-rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index 98b7c92..abcbe93 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -193,9 +193,7 @@ class ThroughputTest : public BrowserPerfTest { command_line->AppendSwitch(switches::kDisableGpuVsync); command_line->AppendSwitch(switches::kAllowFileAccessFromFiles); // Enable or disable GPU acceleration. - if (use_gpu_) { - command_line->AppendSwitch(switches::kForceCompositingMode); - } else { + if (!use_gpu_) { command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); command_line->AppendSwitch(switches::kDisableExperimentalWebGL); command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); |