| 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 "cc/tree_synchronizer.h" | 5 #include "cc/tree_synchronizer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "cc/animation/layer_animation_controller.h" |
| 9 #include "cc/layer.h" | 10 #include "cc/layer.h" |
| 10 #include "cc/layer_animation_controller.h" | |
| 11 #include "cc/layer_impl.h" | 11 #include "cc/layer_impl.h" |
| 12 #include "cc/proxy.h" | 12 #include "cc/proxy.h" |
| 13 #include "cc/single_thread_proxy.h" | 13 #include "cc/single_thread_proxy.h" |
| 14 #include "cc/test/animation_test_common.h" | 14 #include "cc/test/animation_test_common.h" |
| 15 #include "cc/test/fake_impl_proxy.h" | 15 #include "cc/test/fake_impl_proxy.h" |
| 16 #include "cc/test/fake_layer_tree_host_impl.h" | 16 #include "cc/test/fake_layer_tree_host_impl.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 18 | 18 |
| 19 namespace cc { | 19 namespace cc { |
| 20 namespace { | 20 namespace { |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), | 505 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), |
| 506 layer_impl_tree_root.Pass(), | 506 layer_impl_tree_root.Pass(), |
| 507 host_impl_.active_tree()); | 507 host_impl_.active_tree()); |
| 508 | 508 |
| 509 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>( | 509 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>( |
| 510 layer_tree_root->layer_animation_controller())->SynchronizedAnimations()); | 510 layer_tree_root->layer_animation_controller())->SynchronizedAnimations()); |
| 511 } | 511 } |
| 512 | 512 |
| 513 } // namespace | 513 } // namespace |
| 514 } // namespace cc | 514 } // namespace cc |
| OLD | NEW |