| 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" | |
| 13 #include "CCTextureUpdateQueue.h" | |
| 14 #include "CCThreadedTest.h" | 12 #include "CCThreadedTest.h" |
| 15 #include "CCTimingFunction.h" | 13 #include "CCTimingFunction.h" |
| 16 #include "base/synchronization/lock.h" | 14 #include "base/synchronization/lock.h" |
| 17 #include "cc/content_layer.h" | 15 #include "cc/content_layer.h" |
| 18 #include "cc/content_layer_client.h" | 16 #include "cc/content_layer_client.h" |
| 17 #include "cc/single_thread_proxy.h" |
| 19 #include "cc/test/fake_web_compositor_output_surface.h" | 18 #include "cc/test/fake_web_compositor_output_surface.h" |
| 20 #include "cc/test/geometry_test_utils.h" | 19 #include "cc/test/geometry_test_utils.h" |
| 21 #include "cc/test/occlusion_tracker_test_common.h" | 20 #include "cc/test/occlusion_tracker_test_common.h" |
| 21 #include "cc/texture_update_queue.h" |
| 22 #include "testing/gmock/include/gmock/gmock.h" | 22 #include "testing/gmock/include/gmock/gmock.h" |
| 23 #include "third_party/khronos/GLES2/gl2.h" | 23 #include "third_party/khronos/GLES2/gl2.h" |
| 24 #include "third_party/khronos/GLES2/gl2ext.h" | 24 #include "third_party/khronos/GLES2/gl2ext.h" |
| 25 #include <public/Platform.h> | 25 #include <public/Platform.h> |
| 26 #include <public/WebLayerScrollClient.h> | 26 #include <public/WebLayerScrollClient.h> |
| 27 #include <public/WebSize.h> | 27 #include <public/WebSize.h> |
| 28 | 28 |
| 29 using namespace cc; | 29 using namespace cc; |
| 30 using namespace WebKit; | 30 using namespace WebKit; |
| 31 using namespace WebKitTests; | 31 using namespace WebKitTests; |
| (...skipping 2937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2969 int m_numCommitComplete; | 2969 int m_numCommitComplete; |
| 2970 int m_numDrawLayers; | 2970 int m_numDrawLayers; |
| 2971 }; | 2971 }; |
| 2972 | 2972 |
| 2973 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread) | 2973 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread) |
| 2974 { | 2974 { |
| 2975 runTest(true); | 2975 runTest(true); |
| 2976 } | 2976 } |
| 2977 | 2977 |
| 2978 } // namespace | 2978 } // namespace |
| OLD | NEW |