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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 // is loaded from the local file system ( file:// ). The following switch | 118 // is loaded from the local file system ( file:// ). The following switch |
119 // fixes that error. | 119 // fixes that error. |
120 command_line->AppendSwitch(switches::kAllowFileAccessFromFiles); | 120 command_line->AppendSwitch(switches::kAllowFileAccessFromFiles); |
121 | 121 |
122 if (HasFlag(kSmallWindow)) { | 122 if (HasFlag(kSmallWindow)) { |
123 command_line->AppendSwitchASCII(switches::kWindowSize, "800,600"); | 123 command_line->AppendSwitchASCII(switches::kWindowSize, "800,600"); |
124 } else { | 124 } else { |
125 command_line->AppendSwitchASCII(switches::kWindowSize, "2000,1500"); | 125 command_line->AppendSwitchASCII(switches::kWindowSize, "2000,1500"); |
126 } | 126 } |
127 | 127 |
128 command_line->AppendSwitch(switches::kDisableTestCompositor); | 128 UseRealGLContexts(); |
129 | 129 |
130 if (!HasFlag(kUseGpu)) { | 130 if (!HasFlag(kUseGpu)) { |
131 command_line->AppendSwitch(switches::kDisableGpu); | 131 command_line->AppendSwitch(switches::kDisableGpu); |
132 } else { | 132 } else { |
133 command_line->AppendSwitch(switches::kForceCompositingMode); | 133 command_line->AppendSwitch(switches::kForceCompositingMode); |
134 } | 134 } |
135 | 135 |
136 if (HasFlag(kDisableVsync)) | 136 if (HasFlag(kDisableVsync)) |
137 command_line->AppendSwitch(switches::kDisableGpuVsync); | 137 command_line->AppendSwitch(switches::kDisableGpuVsync); |
138 | 138 |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 TabCapturePerformanceTest, | 260 TabCapturePerformanceTest, |
261 testing::Values( | 261 testing::Values( |
262 kScalingTestBase | kScaleQualityFast, | 262 kScalingTestBase | kScaleQualityFast, |
263 kScalingTestBase | kScaleQualityGood, | 263 kScalingTestBase | kScaleQualityGood, |
264 kScalingTestBase | kScaleQualityBest, | 264 kScalingTestBase | kScaleQualityBest, |
265 kScalingTestBase | kScaleQualityFast | kSmallWindow, | 265 kScalingTestBase | kScaleQualityFast | kSmallWindow, |
266 kScalingTestBase | kScaleQualityGood | kSmallWindow, | 266 kScalingTestBase | kScaleQualityGood | kSmallWindow, |
267 kScalingTestBase | kScaleQualityBest | kSmallWindow)); | 267 kScalingTestBase | kScaleQualityBest | kSmallWindow)); |
268 | 268 |
269 #endif // USE_AURA | 269 #endif // USE_AURA |
OLD | NEW |