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 "cc/tree_synchronizer.h" | 7 #include "cc/tree_synchronizer.h" |
8 | 8 |
9 #include "Region.h" | 9 #include <algorithm> |
| 10 |
10 #include "cc/layer.h" | 11 #include "cc/layer.h" |
11 #include "cc/layer_animation_controller.h" | 12 #include "cc/layer_animation_controller.h" |
12 #include "cc/layer_impl.h" | 13 #include "cc/layer_impl.h" |
13 #include "cc/proxy.h" | 14 #include "cc/proxy.h" |
14 #include "cc/single_thread_proxy.h" | 15 #include "cc/single_thread_proxy.h" |
15 #include "cc/test/animation_test_common.h" | 16 #include "cc/test/animation_test_common.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
17 | 18 |
18 using namespace cc; | 19 using namespace cc; |
19 using namespace WebKitTests; | 20 using namespace WebKitTests; |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 | 398 |
398 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); | 399 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); |
399 | 400 |
400 scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.get()); | 401 scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.get()); |
401 layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(),
layerImplTreeRoot.Pass(), hostImpl.get()); | 402 layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(),
layerImplTreeRoot.Pass(), hostImpl.get()); |
402 | 403 |
403 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); | 404 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); |
404 } | 405 } |
405 | 406 |
406 } // anonymous namespace | 407 } // anonymous namespace |
OLD | NEW |