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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "CCThreadedTest.h" | 7 #include "CCThreadedTest.h" |
8 | 8 |
9 #include "CCActiveAnimation.h" | 9 #include "CCActiveAnimation.h" |
10 #include "CCInputHandler.h" | 10 #include "CCInputHandler.h" |
11 #include "CCLayerAnimationController.h" | 11 #include "CCLayerAnimationController.h" |
12 #include "CCLayerImpl.h" | 12 #include "CCLayerImpl.h" |
13 #include "CCLayerTreeHostImpl.h" | 13 #include "CCLayerTreeHostImpl.h" |
14 #include "CCScopedThreadProxy.h" | 14 #include "CCScopedThreadProxy.h" |
15 #include "CCSingleThreadProxy.h" | 15 #include "CCSingleThreadProxy.h" |
16 #include "CCTextureUpdateQueue.h" | 16 #include "CCTextureUpdateQueue.h" |
17 #include "CCThreadTask.h" | 17 #include "CCThreadTask.h" |
18 #include "CCTimingFunction.h" | 18 #include "CCTimingFunction.h" |
19 #include "ContentLayerChromium.h" | |
20 #include "LayerChromium.h" | |
21 #include "base/stl_util.h" | 19 #include "base/stl_util.h" |
| 20 #include "cc/content_layer.h" |
| 21 #include "cc/layer.h" |
22 #include "cc/test/animation_test_common.h" | 22 #include "cc/test/animation_test_common.h" |
23 #include "cc/test/fake_web_compositor_output_surface.h" | 23 #include "cc/test/fake_web_compositor_output_surface.h" |
24 #include "cc/test/fake_web_graphics_context_3d.h" | 24 #include "cc/test/fake_web_graphics_context_3d.h" |
25 #include "cc/test/occlusion_tracker_test_common.h" | 25 #include "cc/test/occlusion_tracker_test_common.h" |
26 #include "cc/test/tiled_layer_test_common.h" | 26 #include "cc/test/tiled_layer_test_common.h" |
27 #include "testing/gmock/include/gmock/gmock.h" | 27 #include "testing/gmock/include/gmock/gmock.h" |
28 #include <public/Platform.h> | 28 #include <public/Platform.h> |
29 #include <public/WebCompositorSupport.h> | 29 #include <public/WebCompositorSupport.h> |
30 #include <public/WebFilterOperation.h> | 30 #include <public/WebFilterOperation.h> |
31 #include <public/WebFilterOperations.h> | 31 #include <public/WebFilterOperations.h> |
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 if (m_timedOut) { | 558 if (m_timedOut) { |
559 FAIL() << "Test timed out"; | 559 FAIL() << "Test timed out"; |
560 Platform::current()->compositorSupport()->shutdown(); | 560 Platform::current()->compositorSupport()->shutdown(); |
561 return; | 561 return; |
562 } | 562 } |
563 afterTest(); | 563 afterTest(); |
564 Platform::current()->compositorSupport()->shutdown(); | 564 Platform::current()->compositorSupport()->shutdown(); |
565 } | 565 } |
566 | 566 |
567 } // namespace WebKitTests | 567 } // namespace WebKitTests |
OLD | NEW |