OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #if defined(OS_MACOSX) | 7 #if defined(OS_MACOSX) |
8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
9 #endif | 9 #endif |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 } | 105 } |
106 | 106 |
107 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 107 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
108 if (!ScalingMethod().empty()) { | 108 if (!ScalingMethod().empty()) { |
109 command_line->AppendSwitchASCII(switches::kTabCaptureUpscaleQuality, | 109 command_line->AppendSwitchASCII(switches::kTabCaptureUpscaleQuality, |
110 ScalingMethod()); | 110 ScalingMethod()); |
111 command_line->AppendSwitchASCII(switches::kTabCaptureDownscaleQuality, | 111 command_line->AppendSwitchASCII(switches::kTabCaptureDownscaleQuality, |
112 ScalingMethod()); | 112 ScalingMethod()); |
113 } | 113 } |
114 | 114 |
115 // UI tests boot up render views starting from about:blank. This causes | |
116 // the renderer to start up thinking it cannot use the GPU. To work | |
117 // around that, and allow the frame rate test to use the GPU, we must | |
118 // pass kAllowWebUICompositing. | |
119 command_line->AppendSwitch(switches::kAllowWebUICompositing); | |
120 | |
121 // Some of the tests may launch http requests through JSON or AJAX | 115 // Some of the tests may launch http requests through JSON or AJAX |
122 // which causes a security error (cross domain request) when the page | 116 // which causes a security error (cross domain request) when the page |
123 // is loaded from the local file system ( file:// ). The following switch | 117 // is loaded from the local file system ( file:// ). The following switch |
124 // fixes that error. | 118 // fixes that error. |
125 command_line->AppendSwitch(switches::kAllowFileAccessFromFiles); | 119 command_line->AppendSwitch(switches::kAllowFileAccessFromFiles); |
126 | 120 |
127 if (HasFlag(kSmallWindow)) { | 121 if (HasFlag(kSmallWindow)) { |
128 command_line->AppendSwitchASCII(switches::kWindowSize, "800,600"); | 122 command_line->AppendSwitchASCII(switches::kWindowSize, "800,600"); |
129 } else { | 123 } else { |
130 command_line->AppendSwitchASCII(switches::kWindowSize, "2000,1500"); | 124 command_line->AppendSwitchASCII(switches::kWindowSize, "2000,1500"); |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 TabCapturePerformanceTest, | 256 TabCapturePerformanceTest, |
263 testing::Values( | 257 testing::Values( |
264 kScalingTestBase | kScaleQualityFast, | 258 kScalingTestBase | kScaleQualityFast, |
265 kScalingTestBase | kScaleQualityGood, | 259 kScalingTestBase | kScaleQualityGood, |
266 kScalingTestBase | kScaleQualityBest, | 260 kScalingTestBase | kScaleQualityBest, |
267 kScalingTestBase | kScaleQualityFast | kSmallWindow, | 261 kScalingTestBase | kScaleQualityFast | kSmallWindow, |
268 kScalingTestBase | kScaleQualityGood | kSmallWindow, | 262 kScalingTestBase | kScaleQualityGood | kSmallWindow, |
269 kScalingTestBase | kScaleQualityBest | kSmallWindow)); | 263 kScalingTestBase | kScaleQualityBest | kSmallWindow)); |
270 | 264 |
271 #endif // USE_AURA | 265 #endif // USE_AURA |
OLD | NEW |