OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <map> | 5 #include <map> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 TEST_P(FrameRateCompositingTest, content) { \ | 259 TEST_P(FrameRateCompositingTest, content) { \ |
260 RunTest(#content); \ | 260 RunTest(#content); \ |
261 } | 261 } |
262 | 262 |
263 INSTANTIATE_TEST_CASE_P(, FrameRateCompositingTest, ::testing::Values( | 263 INSTANTIATE_TEST_CASE_P(, FrameRateCompositingTest, ::testing::Values( |
264 0, | 264 0, |
265 kUseGpu | kForceGpuComposited, | 265 kUseGpu | kForceGpuComposited, |
266 kUseReferenceBuild, | 266 kUseReferenceBuild, |
267 kUseReferenceBuild | kUseGpu | kForceGpuComposited)); | 267 kUseReferenceBuild | kUseGpu | kForceGpuComposited)); |
268 | 268 |
| 269 // crbug.com/132133 |
| 270 #if !defined(OS_WIN) |
269 FRAME_RATE_TEST_WITH_AND_WITHOUT_ACCELERATED_COMPOSITING(blank); | 271 FRAME_RATE_TEST_WITH_AND_WITHOUT_ACCELERATED_COMPOSITING(blank); |
270 FRAME_RATE_TEST_WITH_AND_WITHOUT_ACCELERATED_COMPOSITING(googleblog); | 272 FRAME_RATE_TEST_WITH_AND_WITHOUT_ACCELERATED_COMPOSITING(googleblog); |
| 273 #endif |
271 | 274 |
272 typedef FrameRateTest FrameRateNoVsyncCanvasInternalTest; | 275 typedef FrameRateTest FrameRateNoVsyncCanvasInternalTest; |
273 | 276 |
274 // Tests for animated 2D canvas content with and without disabling vsync | 277 // Tests for animated 2D canvas content with and without disabling vsync |
275 #define INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(content) \ | 278 #define INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(content) \ |
276 TEST_P(FrameRateNoVsyncCanvasInternalTest, content) { \ | 279 TEST_P(FrameRateNoVsyncCanvasInternalTest, content) { \ |
277 RunTest(#content); \ | 280 RunTest(#content); \ |
278 } | 281 } |
279 | 282 |
280 INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values( | 283 INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values( |
281 kInternal | kHasRedirect, | 284 kInternal | kHasRedirect, |
282 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu, | 285 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu, |
283 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync, | 286 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync, |
284 kUseReferenceBuild | kInternal | kHasRedirect, | 287 kUseReferenceBuild | kInternal | kHasRedirect, |
285 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, | 288 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, |
286 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | | 289 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | |
287 kDisableVsync)); | 290 kDisableVsync)); |
288 | 291 |
| 292 // crbug.com/132133 |
| 293 #if !defined(OS_WIN) |
289 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl) | 294 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl) |
| 295 #endif |
290 | 296 |
291 typedef FrameRateTest FrameRateGpuCanvasInternalTest; | 297 typedef FrameRateTest FrameRateGpuCanvasInternalTest; |
292 | 298 |
293 // Tests for animated 2D canvas content to be tested only with GPU | 299 // Tests for animated 2D canvas content to be tested only with GPU |
294 // acceleration. | 300 // acceleration. |
295 // tests are run with and without Vsync | 301 // tests are run with and without Vsync |
296 #define INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(content) \ | 302 #define INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(content) \ |
297 TEST_P(FrameRateGpuCanvasInternalTest, content) { \ | 303 TEST_P(FrameRateGpuCanvasInternalTest, content) { \ |
298 RunTest(#content); \ | 304 RunTest(#content); \ |
299 } | 305 } |
300 | 306 |
301 INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values( | 307 INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values( |
302 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu, | 308 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu, |
303 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync, | 309 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync, |
304 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, | 310 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, |
305 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | | 311 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | |
306 kDisableVsync)); | 312 kDisableVsync)); |
307 | 313 |
| 314 // crbug.com/132133 |
| 315 #if !defined(OS_WIN) |
308 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies) | 316 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies) |
309 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE) | 317 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE) |
310 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading) | 318 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading) |
| 319 #endif |
311 | 320 |
312 } // namespace | 321 } // namespace |
OLD | NEW |