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 "TreeSynchronizer.h" | 7 #include "cc/tree_synchronizer.h" |
8 | 8 |
9 #include "CCLayerAnimationController.h" | 9 #include "CCLayerAnimationController.h" |
10 #include "CCLayerImpl.h" | 10 #include "CCLayerImpl.h" |
11 #include "CCProxy.h" | 11 #include "CCProxy.h" |
12 #include "CCSingleThreadProxy.h" | 12 #include "CCSingleThreadProxy.h" |
13 #include "LayerChromium.h" | |
14 #include "Region.h" | 13 #include "Region.h" |
| 14 #include "cc/layer.h" |
15 #include "cc/test/animation_test_common.h" | 15 #include "cc/test/animation_test_common.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
17 | 17 |
18 using namespace cc; | 18 using namespace cc; |
19 using namespace WebKitTests; | 19 using namespace WebKitTests; |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 class MockCCLayerImpl : public CCLayerImpl { | 23 class MockCCLayerImpl : public CCLayerImpl { |
24 public: | 24 public: |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 | 396 |
397 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); | 397 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); |
398 | 398 |
399 scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), hostImpl.get()); | 399 scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), hostImpl.get()); |
400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc
LayerTreeRoot.Pass(), hostImpl.get()); | 400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc
LayerTreeRoot.Pass(), hostImpl.get()); |
401 | 401 |
402 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); | 402 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); |
403 } | 403 } |
404 | 404 |
405 } // namespace | 405 } // namespace |
OLD | NEW |