Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(624)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/layer_proto_converter_unittest.cc

Issue 1808373002: cc : Make tree synchronization independent of layer tree hierarchy (2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer_proto_converter.cc ('k') | cc/layers/layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_proto_converter_unittest.cc
diff --git a/cc/layers/layer_proto_converter_unittest.cc b/cc/layers/layer_proto_converter_unittest.cc
index fd88da4b17e79c46e9e2c2256aa0859013c3714c..2de7f7d37ce47be08f4dfee05373bf2fdff53a0f 100644
--- a/cc/layers/layer_proto_converter_unittest.cc
+++ b/cc/layers/layer_proto_converter_unittest.cc
@@ -181,6 +181,7 @@ TEST_F(LayerProtoConverterTest, RecursivePropertiesSerialization) {
scoped_refptr<Layer> layer_src_b_replica = Layer::Create();
scoped_refptr<Layer> layer_src_c = Layer::Create();
scoped_refptr<Layer> layer_src_d = Layer::Create();
+ layer_src_root->SetLayerTreeHost(layer_tree_host_.get());
layer_src_root->AddChild(layer_src_a);
layer_src_root->AddChild(layer_src_b);
layer_src_a->AddChild(layer_src_c);
@@ -189,97 +190,78 @@ TEST_F(LayerProtoConverterTest, RecursivePropertiesSerialization) {
layer_src_b->SetReplicaLayer(layer_src_b_replica.get());
proto::LayerUpdate layer_update;
- LayerProtoConverter::SerializeLayerProperties(layer_src_root.get(),
- &layer_update);
+ LayerProtoConverter::SerializeLayerProperties(
+ layer_src_root->layer_tree_host(), &layer_update);
// All flags for pushing properties should have been cleared.
- EXPECT_FALSE(layer_src_root->needs_push_properties());
- EXPECT_FALSE(layer_src_root->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_a->needs_push_properties());
- EXPECT_FALSE(layer_src_a->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b->needs_push_properties());
- EXPECT_FALSE(layer_src_b->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b_mask->needs_push_properties());
- EXPECT_FALSE(layer_src_b_mask->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b_replica->needs_push_properties());
- EXPECT_FALSE(layer_src_b_replica->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_c->needs_push_properties());
- EXPECT_FALSE(layer_src_c->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_d->needs_push_properties());
- EXPECT_FALSE(layer_src_d->descendant_needs_push_properties());
-
- // AddChild changes the stacking order of child and it needs to push
- // properties.
- ASSERT_EQ(5, layer_update.layers_size());
- EXPECT_EQ(layer_src_root->id(), layer_update.layers(0).id());
- proto::LayerProperties dest_root = layer_update.layers(0);
- EXPECT_EQ(layer_src_a->id(), layer_update.layers(1).id());
- proto::LayerProperties dest_a = layer_update.layers(1);
- EXPECT_EQ(layer_src_c->id(), layer_update.layers(2).id());
- proto::LayerProperties dest_c = layer_update.layers(2);
- EXPECT_EQ(layer_src_b->id(), layer_update.layers(3).id());
- proto::LayerProperties dest_b = layer_update.layers(3);
- EXPECT_EQ(layer_src_d->id(), layer_update.layers(4).id());
- proto::LayerProperties dest_d = layer_update.layers(4);
+ EXPECT_FALSE(
+ layer_src_root->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_root.get()));
+ EXPECT_FALSE(
+ layer_src_a->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_a.get()));
+ EXPECT_FALSE(
+ layer_src_b->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_b.get()));
+ EXPECT_FALSE(
+ layer_src_b_mask->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_b_mask.get()));
+ EXPECT_FALSE(
+ layer_src_b_replica->layer_tree_host()
+ ->LayerNeedsPushPropertiesForTesting(layer_src_b_replica.get()));
+ EXPECT_FALSE(
+ layer_src_c->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_c.get()));
+ EXPECT_FALSE(
+ layer_src_d->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_d.get()));
+
+ // All layers needs to push properties as their layer tree host changed.
+ ASSERT_EQ(7, layer_update.layers_size());
layer_update.Clear();
+ std::unordered_set<int> dirty_layer_ids;
layer_src_a->SetNeedsPushProperties();
+ dirty_layer_ids.insert(layer_src_a->id());
layer_src_b->SetNeedsPushProperties();
+ dirty_layer_ids.insert(layer_src_b->id());
layer_src_b_mask->SetNeedsPushProperties();
+ dirty_layer_ids.insert(layer_src_b_mask->id());
layer_src_d->SetNeedsPushProperties();
+ dirty_layer_ids.insert(layer_src_d->id());
- LayerProtoConverter::SerializeLayerProperties(layer_src_root.get(),
- &layer_update);
+ LayerProtoConverter::SerializeLayerProperties(
+ layer_src_root->layer_tree_host(), &layer_update);
// All flags for pushing properties should have been cleared.
- EXPECT_FALSE(layer_src_root->needs_push_properties());
- EXPECT_FALSE(layer_src_root->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_a->needs_push_properties());
- EXPECT_FALSE(layer_src_a->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b->needs_push_properties());
- EXPECT_FALSE(layer_src_b->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b_mask->needs_push_properties());
- EXPECT_FALSE(layer_src_b_mask->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b_replica->needs_push_properties());
- EXPECT_FALSE(layer_src_b_replica->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_c->needs_push_properties());
- EXPECT_FALSE(layer_src_c->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_d->needs_push_properties());
- EXPECT_FALSE(layer_src_d->descendant_needs_push_properties());
-
- // Only 5 of the layers should have been serialized.
- ASSERT_EQ(5, layer_update.layers_size());
- EXPECT_EQ(layer_src_root->id(), layer_update.layers(0).id());
- dest_root = layer_update.layers(0);
- EXPECT_EQ(layer_src_a->id(), layer_update.layers(1).id());
- dest_a = layer_update.layers(1);
- EXPECT_EQ(layer_src_b->id(), layer_update.layers(2).id());
- dest_b = layer_update.layers(2);
- EXPECT_EQ(layer_src_d->id(), layer_update.layers(3).id());
- dest_d = layer_update.layers(3);
- EXPECT_EQ(layer_src_b_mask->id(), layer_update.layers(4).id());
- proto::LayerProperties dest_b_mask = layer_update.layers(4);
-
- // Ensure the properties and dependants metadata is correctly serialized.
- EXPECT_FALSE(dest_root.needs_push_properties());
- EXPECT_EQ(2, dest_root.num_dependents_need_push_properties());
- EXPECT_FALSE(dest_root.has_base());
-
- EXPECT_TRUE(dest_a.needs_push_properties());
- EXPECT_EQ(0, dest_a.num_dependents_need_push_properties());
- EXPECT_TRUE(dest_a.has_base());
-
- EXPECT_TRUE(dest_b.needs_push_properties());
- EXPECT_EQ(2, dest_b.num_dependents_need_push_properties());
- EXPECT_TRUE(dest_b.has_base());
-
- EXPECT_TRUE(dest_d.needs_push_properties());
- EXPECT_EQ(0, dest_d.num_dependents_need_push_properties());
- EXPECT_TRUE(dest_d.has_base());
-
- EXPECT_TRUE(dest_b_mask.needs_push_properties());
- EXPECT_EQ(0, dest_b_mask.num_dependents_need_push_properties());
- EXPECT_TRUE(dest_b_mask.has_base());
+ EXPECT_FALSE(
+ layer_src_root->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_root.get()));
+ EXPECT_FALSE(
+ layer_src_a->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_a.get()));
+ EXPECT_FALSE(
+ layer_src_b->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_b.get()));
+ EXPECT_FALSE(
+ layer_src_b_mask->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_b_mask.get()));
+ EXPECT_FALSE(
+ layer_src_b_replica->layer_tree_host()
+ ->LayerNeedsPushPropertiesForTesting(layer_src_b_replica.get()));
+ EXPECT_FALSE(
+ layer_src_c->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_c.get()));
+ EXPECT_FALSE(
+ layer_src_d->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_d.get()));
+
+ // Only 4 of the layers should have been serialized.
+ ASSERT_EQ(4, layer_update.layers_size());
+ for (int index = 0; index < layer_update.layers_size(); index++)
+ EXPECT_NE(dirty_layer_ids.find(layer_update.layers(index).id()),
+ dirty_layer_ids.end());
+ layer_src_root->SetLayerTreeHost(nullptr);
}
TEST_F(LayerProtoConverterTest, RecursivePropertiesSerializationSingleChild) {
@@ -300,115 +282,44 @@ TEST_F(LayerProtoConverterTest, RecursivePropertiesSerializationSingleChild) {
layer_src_root->AddChild(layer_src_b);
layer_src_b->AddChild(layer_src_c);
layer_src_b->SetMaskLayer(layer_src_b_mask.get());
+ layer_src_root->SetLayerTreeHost(layer_tree_host_.get());
proto::LayerUpdate layer_update;
- LayerProtoConverter::SerializeLayerProperties(layer_src_root.get(),
- &layer_update);
- // AddChild changes stacking order of child and we need to push proeprties of
- // child.
- ASSERT_EQ(3, layer_update.layers_size());
+ LayerProtoConverter::SerializeLayerProperties(
+ layer_src_root->layer_tree_host(), &layer_update);
+ // All layers need to push properties as their layer tree host changed.
+ ASSERT_EQ(4, layer_update.layers_size());
layer_update.Clear();
+ std::unordered_set<int> dirty_layer_ids;
layer_src_b->SetNeedsPushProperties();
+ dirty_layer_ids.insert(layer_src_b->id());
layer_src_b_mask->SetNeedsPushProperties();
+ dirty_layer_ids.insert(layer_src_b_mask->id());
- LayerProtoConverter::SerializeLayerProperties(layer_src_root.get(),
- &layer_update);
+ LayerProtoConverter::SerializeLayerProperties(
+ layer_src_root->layer_tree_host(), &layer_update);
// All flags for pushing properties should have been cleared.
- EXPECT_FALSE(layer_src_root->needs_push_properties());
- EXPECT_FALSE(layer_src_root->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b->needs_push_properties());
- EXPECT_FALSE(layer_src_b->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_b_mask->needs_push_properties());
- EXPECT_FALSE(layer_src_b_mask->descendant_needs_push_properties());
- EXPECT_FALSE(layer_src_c->needs_push_properties());
- EXPECT_FALSE(layer_src_c->descendant_needs_push_properties());
-
- // Only 3 of the layers should have been serialized.
- ASSERT_EQ(3, layer_update.layers_size());
- EXPECT_EQ(layer_src_root->id(), layer_update.layers(0).id());
- proto::LayerProperties dest_root = layer_update.layers(0);
- EXPECT_EQ(layer_src_b->id(), layer_update.layers(1).id());
- proto::LayerProperties dest_b = layer_update.layers(1);
- EXPECT_EQ(layer_src_b_mask->id(), layer_update.layers(2).id());
- proto::LayerProperties dest_b_mask = layer_update.layers(2);
-
- // Ensure the properties and dependants metadata is correctly serialized.
- EXPECT_FALSE(dest_root.needs_push_properties());
- EXPECT_EQ(1, dest_root.num_dependents_need_push_properties());
- EXPECT_FALSE(dest_root.has_base());
-
- EXPECT_TRUE(dest_b.needs_push_properties());
- EXPECT_EQ(1, dest_b.num_dependents_need_push_properties());
- EXPECT_TRUE(dest_b.has_base());
-
- EXPECT_TRUE(dest_b_mask.needs_push_properties());
- EXPECT_EQ(0, dest_b_mask.num_dependents_need_push_properties());
- EXPECT_TRUE(dest_b_mask.has_base());
-}
-
-TEST_F(LayerProtoConverterTest, DeserializeLayerProperties) {
- /* Testing deserialization of properties for a tree that looks like this:
- root*+
- / \
- a b+
- \
- c*
- Layers marked with * have changed properties.
- Layers marked with + have descendants with changed properties.
- */
- proto::LayerUpdate updates;
-
- scoped_refptr<Layer> root = Layer::Create();
- root->SetLayerTreeHost(layer_tree_host_.get());
- proto::LayerProperties* root_props = updates.add_layers();
- root_props->set_id(root->id());
- root_props->set_needs_push_properties(true);
- root_props->set_num_dependents_need_push_properties(1);
- root_props->mutable_base();
-
- scoped_refptr<Layer> a = Layer::Create();
- a->SetLayerTreeHost(layer_tree_host_.get());
- proto::LayerProperties* a_props = updates.add_layers();
- a_props->set_id(a->id());
- a_props->set_needs_push_properties(false);
- a_props->set_num_dependents_need_push_properties(0);
- root->AddChild(a);
-
- scoped_refptr<Layer> b = Layer::Create();
- b->SetLayerTreeHost(layer_tree_host_.get());
- proto::LayerProperties* b_props = updates.add_layers();
- b_props->set_id(b->id());
- b_props->set_needs_push_properties(false);
- b_props->set_num_dependents_need_push_properties(1);
- root->AddChild(b);
-
- scoped_refptr<Layer> c = Layer::Create();
- c->SetLayerTreeHost(layer_tree_host_.get());
- proto::LayerProperties* c_props = updates.add_layers();
- c_props->set_id(c->id());
- c_props->set_needs_push_properties(true);
- c_props->set_num_dependents_need_push_properties(0);
- c_props->mutable_base();
- b->AddChild(c);
-
- LayerProtoConverter::DeserializeLayerProperties(root.get(), updates);
-
- EXPECT_TRUE(root->needs_push_properties());
- EXPECT_TRUE(root->descendant_needs_push_properties());
-
- EXPECT_FALSE(a->needs_push_properties());
- EXPECT_FALSE(a->descendant_needs_push_properties());
-
- EXPECT_FALSE(b->needs_push_properties());
- EXPECT_TRUE(b->descendant_needs_push_properties());
-
- EXPECT_TRUE(c->needs_push_properties());
- EXPECT_FALSE(c->descendant_needs_push_properties());
-
- // Recursively clear out LayerTreeHost.
- root->SetLayerTreeHost(nullptr);
+ EXPECT_FALSE(
+ layer_src_root->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_root.get()));
+ EXPECT_FALSE(
+ layer_src_b->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_b.get()));
+ EXPECT_FALSE(
+ layer_src_b_mask->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_b_mask.get()));
+ EXPECT_FALSE(
+ layer_src_c->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
+ layer_src_c.get()));
+
+ // Only 2 of the layers should have been serialized.
+ ASSERT_EQ(2, layer_update.layers_size());
+ for (int index = 0; index < layer_update.layers_size(); index++)
+ EXPECT_NE(dirty_layer_ids.find(layer_update.layers(index).id()),
+ dirty_layer_ids.end());
+ layer_src_root->SetLayerTreeHost(nullptr);
}
TEST_F(LayerProtoConverterTest, PictureLayerTypeSerialization) {
« no previous file with comments | « cc/layers/layer_proto_converter.cc ('k') | cc/layers/layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698