| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index 842a7977b59cbe88bd2559cffe46655980434335..555b724e36676c110ea6db4124a709b6c7b93361 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -6766,5 +6766,49 @@ TEST_F(LayerTreeHostImplTest, ScrollAnimated) {
|
| EXPECT_EQ(NULL, host_impl_->CurrentlyScrollingLayer());
|
| }
|
|
|
| +TEST_F(LayerTreeHostImplTest, PairedPictureLayers) {
|
| + host_impl_->CreatePendingTree();
|
| + host_impl_->ActivateSyncTree();
|
| + host_impl_->CreatePendingTree();
|
| +
|
| + LayerTreeImpl* active_tree = host_impl_->active_tree();
|
| + LayerTreeImpl* pending_tree = host_impl_->pending_tree();
|
| + EXPECT_NE(active_tree, pending_tree);
|
| +
|
| + scoped_ptr<FakePictureLayerImpl> active_layer =
|
| + FakePictureLayerImpl::Create(active_tree, 10);
|
| + scoped_ptr<FakePictureLayerImpl> pending_layer =
|
| + FakePictureLayerImpl::Create(pending_tree, 10);
|
| +
|
| + std::vector<PairedPictureLayer> paired_layers;
|
| + host_impl_->GetPairedPictureLayers(&paired_layers);
|
| +
|
| + EXPECT_EQ(2u, paired_layers.size());
|
| + if (paired_layers[0].active_layer) {
|
| + EXPECT_EQ(active_layer.get(), paired_layers[0].active_layer);
|
| + EXPECT_EQ(NULL, paired_layers[0].pending_layer);
|
| + } else {
|
| + EXPECT_EQ(pending_layer.get(), paired_layers[0].pending_layer);
|
| + EXPECT_EQ(NULL, paired_layers[0].active_layer);
|
| + }
|
| +
|
| + if (paired_layers[1].active_layer) {
|
| + EXPECT_EQ(active_layer.get(), paired_layers[1].active_layer);
|
| + EXPECT_EQ(NULL, paired_layers[1].pending_layer);
|
| + } else {
|
| + EXPECT_EQ(pending_layer.get(), paired_layers[1].pending_layer);
|
| + EXPECT_EQ(NULL, paired_layers[1].active_layer);
|
| + }
|
| +
|
| + active_layer->set_twin_layer(pending_layer.get());
|
| + pending_layer->set_twin_layer(active_layer.get());
|
| +
|
| + host_impl_->GetPairedPictureLayers(&paired_layers);
|
| + EXPECT_EQ(1u, paired_layers.size());
|
| +
|
| + EXPECT_EQ(active_layer.get(), paired_layers[0].active_layer);
|
| + EXPECT_EQ(pending_layer.get(), paired_layers[0].pending_layer);
|
| +}
|
| +
|
| } // namespace
|
| } // namespace cc
|
|
|