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 #include "cc/test/layer_tree_test_common.h" | 5 #include "cc/test/layer_tree_test_common.h" |
6 | 6 |
7 #include "cc/animation.h" | 7 #include "cc/animation.h" |
8 #include "cc/animation_registrar.h" | 8 #include "cc/animation_registrar.h" |
| 9 #include "cc/base/thread_impl.h" |
9 #include "cc/content_layer.h" | 10 #include "cc/content_layer.h" |
10 #include "cc/input_handler.h" | 11 #include "cc/input_handler.h" |
11 #include "cc/layer.h" | 12 #include "cc/layer.h" |
12 #include "cc/layer_animation_controller.h" | 13 #include "cc/layer_animation_controller.h" |
13 #include "cc/layer_impl.h" | 14 #include "cc/layer_impl.h" |
14 #include "cc/layer_tree_host_impl.h" | 15 #include "cc/layer_tree_host_impl.h" |
15 #include "cc/single_thread_proxy.h" | 16 #include "cc/single_thread_proxy.h" |
16 #include "cc/thread_impl.h" | |
17 #include "cc/test/animation_test_common.h" | 17 #include "cc/test/animation_test_common.h" |
18 #include "cc/test/fake_layer_tree_host_client.h" | 18 #include "cc/test/fake_layer_tree_host_client.h" |
19 #include "cc/test/fake_output_surface.h" | 19 #include "cc/test/fake_output_surface.h" |
20 #include "cc/test/occlusion_tracker_test_common.h" | 20 #include "cc/test/occlusion_tracker_test_common.h" |
21 #include "cc/test/tiled_layer_test_common.h" | 21 #include "cc/test/tiled_layer_test_common.h" |
22 #include "cc/timing_function.h" | 22 #include "cc/timing_function.h" |
23 #include "testing/gmock/include/gmock/gmock.h" | 23 #include "testing/gmock/include/gmock/gmock.h" |
24 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.
h" | 24 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.
h" |
25 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations
.h" | 25 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations
.h" |
26 #include "ui/gfx/size_conversions.h" | 26 #include "ui/gfx/size_conversions.h" |
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 ASSERT_FALSE(m_layerTreeHost.get()); | 514 ASSERT_FALSE(m_layerTreeHost.get()); |
515 m_client.reset(); | 515 m_client.reset(); |
516 if (m_timedOut) { | 516 if (m_timedOut) { |
517 FAIL() << "Test timed out"; | 517 FAIL() << "Test timed out"; |
518 return; | 518 return; |
519 } | 519 } |
520 afterTest(); | 520 afterTest(); |
521 } | 521 } |
522 | 522 |
523 } // namespace cc | 523 } // namespace cc |
OLD | NEW |