| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #ifndef CC_TEST_LAYER_TREE_TEST_H_ | 5 #ifndef CC_TEST_LAYER_TREE_TEST_H_ |
| 6 #define CC_TEST_LAYER_TREE_TEST_H_ | 6 #define CC_TEST_LAYER_TREE_TEST_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
| 10 #include "cc/animation/animation_delegate.h" | 10 #include "cc/animation/animation_delegate.h" |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 }; | 204 }; |
| 205 | 205 |
| 206 } // namespace cc | 206 } // namespace cc |
| 207 | 207 |
| 208 #define SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME) \ | 208 #define SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME) \ |
| 209 TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DelegatingRenderer) { \ | 209 TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DelegatingRenderer) { \ |
| 210 RunTest(CompositorMode::SINGLE_THREADED); \ | 210 RunTest(CompositorMode::SINGLE_THREADED); \ |
| 211 } \ | 211 } \ |
| 212 class SingleThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {} | 212 class SingleThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {} |
| 213 | 213 |
| 214 // This test is flaky, so marked with DISABLED (https://crbug.com/702329) | 214 #define MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ |
| 215 #define MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ | 215 TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DelegatingRenderer) { \ |
| 216 TEST_F(TEST_FIXTURE_NAME, DISABLED_RunMultiThread_DelegatingRenderer) { \ | 216 RunTest(CompositorMode::THREADED); \ |
| 217 RunTest(CompositorMode::THREADED); \ | 217 } \ |
| 218 } \ | |
| 219 class MultiThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {} | 218 class MultiThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {} |
| 220 | 219 |
| 221 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ | 220 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ |
| 222 SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \ | 221 SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \ |
| 223 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) | 222 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) |
| 224 | 223 |
| 225 #define REMOTE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ | 224 #define REMOTE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ |
| 226 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME); \ | 225 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME); \ |
| 227 REMOTE_TEST_F(TEST_FIXTURE_NAME) | 226 REMOTE_TEST_F(TEST_FIXTURE_NAME) |
| 228 | 227 |
| 229 // Some tests want to control when notify ready for activation occurs, | 228 // Some tests want to control when notify ready for activation occurs, |
| 230 // but this is not supported in the single-threaded case. | 229 // but this is not supported in the single-threaded case. |
| 231 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \ | 230 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \ |
| 232 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) | 231 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) |
| 233 | 232 |
| 234 #endif // CC_TEST_LAYER_TREE_TEST_H_ | 233 #endif // CC_TEST_LAYER_TREE_TEST_H_ |
| OLD | NEW |