| 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 <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| 11 #include "cc/layer.h" | 11 #include "cc/layer.h" |
| 12 #include "cc/layer_animation_controller.h" | 12 #include "cc/layer_animation_controller.h" |
| 13 #include "cc/layer_impl.h" | 13 #include "cc/layer_impl.h" |
| 14 #include "cc/proxy.h" | 14 #include "cc/proxy.h" |
| 15 #include "cc/single_thread_proxy.h" | 15 #include "cc/single_thread_proxy.h" |
| 16 #include "cc/test/animation_test_common.h" | 16 #include "cc/test/animation_test_common.h" |
| 17 #include "cc/test/fake_proxy.h" | 17 #include "cc/test/fake_proxy.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
| 19 | 19 |
| 20 using namespace cc; | |
| 21 using namespace WebKitTests; | 20 using namespace WebKitTests; |
| 22 | 21 |
| 22 namespace cc { |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 class MockLayerImpl : public LayerImpl { | 25 class MockLayerImpl : public LayerImpl { |
| 26 public: | 26 public: |
| 27 static scoped_ptr<MockLayerImpl> create(int layerId) | 27 static scoped_ptr<MockLayerImpl> create(int layerId) |
| 28 { | 28 { |
| 29 return make_scoped_ptr(new MockLayerImpl(layerId)); | 29 return make_scoped_ptr(new MockLayerImpl(layerId)); |
| 30 } | 30 } |
| 31 virtual ~MockLayerImpl() | 31 virtual ~MockLayerImpl() |
| 32 { | 32 { |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::cre
ate(&dummy).PassAs<LayerAnimationController>()); | 400 layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::cre
ate(&dummy).PassAs<LayerAnimationController>()); |
| 401 | 401 |
| 402 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); | 402 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); |
| 403 | 403 |
| 404 scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.get()); | 404 scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.get()); |
| 405 layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(),
layerImplTreeRoot.Pass(), hostImpl.get()); | 405 layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(),
layerImplTreeRoot.Pass(), hostImpl.get()); |
| 406 | 406 |
| 407 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); | 407 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); |
| 408 } | 408 } |
| 409 | 409 |
| 410 } // anonymous namespace | 410 } // namespace |
| 411 } // namespace cc |
| OLD | NEW |