| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 private: | 196 private: |
| 197 LayerTreeSettings settings_; | 197 LayerTreeSettings settings_; |
| 198 scoped_ptr<LayerTreeHostClientForTesting> client_; | 198 scoped_ptr<LayerTreeHostClientForTesting> client_; |
| 199 scoped_ptr<LayerTreeHost> layer_tree_host_; | 199 scoped_ptr<LayerTreeHost> layer_tree_host_; |
| 200 FakeOutputSurface* output_surface_; | 200 FakeOutputSurface* output_surface_; |
| 201 | 201 |
| 202 bool beginning_; | 202 bool beginning_; |
| 203 bool end_when_begin_returns_; | 203 bool end_when_begin_returns_; |
| 204 bool timed_out_; | 204 bool timed_out_; |
| 205 bool scheduled_; | 205 bool scheduled_; |
| 206 bool schedule_when_set_visible_true_; | |
| 207 bool started_; | 206 bool started_; |
| 208 bool ended_; | 207 bool ended_; |
| 209 bool delegating_renderer_; | 208 bool delegating_renderer_; |
| 210 | 209 |
| 211 int timeout_seconds_; | 210 int timeout_seconds_; |
| 212 | 211 |
| 213 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; | 212 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |
| 214 scoped_ptr<base::Thread> impl_thread_; | 213 scoped_ptr<base::Thread> impl_thread_; |
| 215 base::CancelableClosure timeout_; | 214 base::CancelableClosure timeout_; |
| 216 scoped_refptr<TestContextProvider> compositor_contexts_; | 215 scoped_refptr<TestContextProvider> compositor_contexts_; |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 | 288 |
| 290 #define SINGLE_AND_MULTI_THREAD_NOIMPL_TEST_F(TEST_FIXTURE_NAME) \ | 289 #define SINGLE_AND_MULTI_THREAD_NOIMPL_TEST_F(TEST_FIXTURE_NAME) \ |
| 291 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ | 290 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ |
| 292 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME) | 291 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME) |
| 293 | 292 |
| 294 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ | 293 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ |
| 295 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ | 294 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ |
| 296 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) | 295 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) |
| 297 | 296 |
| 298 #endif // CC_TEST_LAYER_TREE_TEST_H_ | 297 #endif // CC_TEST_LAYER_TREE_TEST_H_ |
| OLD | NEW |