| 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 "TreeSynchronizer.h" |
| 8 | 8 |
| 9 #include "CCAnimationTestCommon.h" | 9 #include "CCAnimationTestCommon.h" |
| 10 #include "CCLayerAnimationController.h" | 10 #include "CCLayerAnimationController.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 | 112 |
| 113 ASSERT_EQ(!!layer->maskLayer(), !!ccLayer->maskLayer()); | 113 ASSERT_EQ(!!layer->maskLayer(), !!ccLayer->maskLayer()); |
| 114 if (layer->maskLayer()) | 114 if (layer->maskLayer()) |
| 115 expectTreesAreIdentical(layer->maskLayer(), ccLayer->maskLayer(), hostIm
pl); | 115 expectTreesAreIdentical(layer->maskLayer(), ccLayer->maskLayer(), hostIm
pl); |
| 116 | 116 |
| 117 ASSERT_EQ(!!layer->replicaLayer(), !!ccLayer->replicaLayer()); | 117 ASSERT_EQ(!!layer->replicaLayer(), !!ccLayer->replicaLayer()); |
| 118 if (layer->replicaLayer()) | 118 if (layer->replicaLayer()) |
| 119 expectTreesAreIdentical(layer->replicaLayer(), ccLayer->replicaLayer(),
hostImpl); | 119 expectTreesAreIdentical(layer->replicaLayer(), ccLayer->replicaLayer(),
hostImpl); |
| 120 | 120 |
| 121 const Vector<RefPtr<LayerChromium> >& layerChildren = layer->children(); | 121 const Vector<RefPtr<LayerChromium> >& layerChildren = layer->children(); |
| 122 const Vector<OwnPtr<CCLayerImpl> >& ccLayerChildren = ccLayer->children(); | 122 const OwnPtrVector<CCLayerImpl>& ccLayerChildren = ccLayer->children(); |
| 123 | 123 |
| 124 ASSERT_EQ(layerChildren.size(), ccLayerChildren.size()); | 124 ASSERT_EQ(layerChildren.size(), ccLayerChildren.size()); |
| 125 | 125 |
| 126 for (size_t i = 0; i < layerChildren.size(); ++i) | 126 for (size_t i = 0; i < layerChildren.size(); ++i) |
| 127 expectTreesAreIdentical(layerChildren[i].get(), ccLayerChildren[i].get()
, hostImpl); | 127 expectTreesAreIdentical(layerChildren[i].get(), ccLayerChildren[i], host
Impl); |
| 128 } | 128 } |
| 129 | 129 |
| 130 // Attempts to synchronizes a null tree. This should not crash, and should | 130 // Attempts to synchronizes a null tree. This should not crash, and should |
| 131 // return a null tree. | 131 // return a null tree. |
| 132 TEST(TreeSynchronizerTest, syncNullTree) | 132 TEST(TreeSynchronizerTest, syncNullTree) |
| 133 { | 133 { |
| 134 DebugScopedSetImplThread impl; | 134 DebugScopedSetImplThread impl; |
| 135 | 135 |
| 136 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(0,
nullptr, 0); | 136 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(0,
nullptr, 0); |
| 137 | 137 |
| (...skipping 258 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 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(lay
erTreeRoot.get(), nullptr, hostImpl.get()); | 399 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(lay
erTreeRoot.get(), nullptr, hostImpl.get()); |
| 400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc
LayerTreeRoot.release(), hostImpl.get()); | 400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc
LayerTreeRoot.release(), 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 |