| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 #define INTERNAL_FRAME_RATE_TEST_CANVAS(content) \ | 179 #define INTERNAL_FRAME_RATE_TEST_CANVAS(content) \ |
| 180 TEST_P(FrameRateCanvasInternalTest, content) { \ | 180 TEST_P(FrameRateCanvasInternalTest, content) { \ |
| 181 RunTest(#content); \ | 181 RunTest(#content); \ |
| 182 } \ | 182 } \ |
| 183 | 183 |
| 184 INSTANTIATE_TEST_CASE_P(, FrameRateCanvasInternalTest, ::testing::Values( | 184 INSTANTIATE_TEST_CASE_P(, FrameRateCanvasInternalTest, ::testing::Values( |
| 185 kInternal, | 185 kInternal, |
| 186 kInternal | kDisableGpu, | 186 kInternal | kDisableGpu, |
| 187 kInternal | kUseReferenceBuild)); | 187 kInternal | kUseReferenceBuild)); |
| 188 | 188 |
| 189 INTERNAL_FRAME_RATE_TEST_CANVAS(fireflies) | 189 // Fails on all platforms. See http://crbug.com/102428 |
| 190 INTERNAL_FRAME_RATE_TEST_CANVAS(FishIE) | 190 //INTERNAL_FRAME_RATE_TEST_CANVAS(fireflies) |
| 191 //INTERNAL_FRAME_RATE_TEST_CANVAS(FishIE) |
| 191 | 192 |
| 192 typedef FrameRateTest FrameRateNoVsyncCanvasInternalTest; | 193 typedef FrameRateTest FrameRateNoVsyncCanvasInternalTest; |
| 193 | 194 |
| 194 // Tests for animated 2D canvas content with and without disabling vsync | 195 // Tests for animated 2D canvas content with and without disabling vsync |
| 195 #define INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(content) \ | 196 #define INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(content) \ |
| 196 TEST_P(FrameRateNoVsyncCanvasInternalTest, content) { \ | 197 TEST_P(FrameRateNoVsyncCanvasInternalTest, content) { \ |
| 197 RunTest(#content); \ | 198 RunTest(#content); \ |
| 198 } \ | 199 } \ |
| 199 | 200 |
| 200 INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values( | 201 INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values( |
| 201 kInternal, | 202 kInternal, |
| 202 kInternal | kDisableVsync, | 203 kInternal | kDisableVsync, |
| 203 kInternal | kDisableGpu, | 204 kInternal | kDisableGpu, |
| 204 kInternal | kUseReferenceBuild, | 205 kInternal | kUseReferenceBuild, |
| 205 kInternal | kDisableVsync | kUseReferenceBuild)); | 206 kInternal | kDisableVsync | kUseReferenceBuild)); |
| 206 | 207 |
| 207 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl) | 208 // Fails on all platforms. See http://crbug.com/102428 |
| 208 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(speedreading) | 209 //INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl) |
| 210 //INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(speedreading) |
| 209 | 211 |
| 210 } // namespace | 212 } // namespace |
| OLD | NEW |