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 "CCLayerTreeHost.h" | 7 #include "CCLayerTreeHost.h" |
8 | 8 |
9 #include "CCGraphicsContext.h" | 9 #include "CCGraphicsContext.h" |
10 #include "CCLayerTreeHostImpl.h" | 10 #include "CCLayerTreeHostImpl.h" |
11 #include "CCSettings.h" | 11 #include "CCSettings.h" |
12 #include "CCSingleThreadProxy.h" | 12 #include "CCSingleThreadProxy.h" |
13 #include "CCTextureUpdateQueue.h" | 13 #include "CCTextureUpdateQueue.h" |
14 #include "CCThreadedTest.h" | 14 #include "CCThreadedTest.h" |
15 #include "CCTimingFunction.h" | 15 #include "CCTimingFunction.h" |
16 #include "ContentLayerChromium.h" | |
17 #include "ContentLayerChromiumClient.h" | |
18 #include "Extensions3DChromium.h" | 16 #include "Extensions3DChromium.h" |
19 #include "base/synchronization/lock.h" | 17 #include "base/synchronization/lock.h" |
| 18 #include "cc/content_layer.h" |
| 19 #include "cc/content_layer_client.h" |
20 #include "cc/test/fake_web_compositor_output_surface.h" | 20 #include "cc/test/fake_web_compositor_output_surface.h" |
21 #include "cc/test/geometry_test_utils.h" | 21 #include "cc/test/geometry_test_utils.h" |
22 #include "cc/test/occlusion_tracker_test_common.h" | 22 #include "cc/test/occlusion_tracker_test_common.h" |
23 #include "testing/gmock/include/gmock/gmock.h" | 23 #include "testing/gmock/include/gmock/gmock.h" |
24 #include <public/Platform.h> | 24 #include <public/Platform.h> |
25 #include <public/WebLayerScrollClient.h> | 25 #include <public/WebLayerScrollClient.h> |
26 #include <public/WebSize.h> | 26 #include <public/WebSize.h> |
27 | 27 |
28 using namespace cc; | 28 using namespace cc; |
29 using namespace WebKit; | 29 using namespace WebKit; |
(...skipping 2936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2966 int m_numCommitComplete; | 2966 int m_numCommitComplete; |
2967 int m_numDrawLayers; | 2967 int m_numDrawLayers; |
2968 }; | 2968 }; |
2969 | 2969 |
2970 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread) | 2970 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread) |
2971 { | 2971 { |
2972 runTest(true); | 2972 runTest(true); |
2973 } | 2973 } |
2974 | 2974 |
2975 } // namespace | 2975 } // namespace |
OLD | NEW |