| 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/layer.h" | 9 #include "cc/layer.h" |
| 10 #include "cc/layer_animation_controller.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_proxy.h" | 15 #include "cc/test/fake_proxy.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 17 | 17 |
| 18 using namespace WebKitTests; | |
| 19 | |
| 20 namespace cc { | 18 namespace cc { |
| 21 namespace { | 19 namespace { |
| 22 | 20 |
| 23 class MockLayerImpl : public LayerImpl { | 21 class MockLayerImpl : public LayerImpl { |
| 24 public: | 22 public: |
| 25 static scoped_ptr<MockLayerImpl> create(LayerTreeHostImpl* hostImpl, int lay
erId) | 23 static scoped_ptr<MockLayerImpl> create(LayerTreeHostImpl* hostImpl, int lay
erId) |
| 26 { | 24 { |
| 27 return make_scoped_ptr(new MockLayerImpl(hostImpl, layerId)); | 25 return make_scoped_ptr(new MockLayerImpl(hostImpl, layerId)); |
| 28 } | 26 } |
| 29 virtual ~MockLayerImpl() | 27 virtual ~MockLayerImpl() |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); | 398 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); |
| 401 | 399 |
| 402 scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.get()); | 400 scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees
(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.get()); |
| 403 layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(),
layerImplTreeRoot.Pass(), hostImpl.get()); | 401 layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(),
layerImplTreeRoot.Pass(), hostImpl.get()); |
| 404 | 402 |
| 405 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); | 403 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); |
| 406 } | 404 } |
| 407 | 405 |
| 408 } // namespace | 406 } // namespace |
| 409 } // namespace cc | 407 } // namespace cc |
| OLD | NEW |