cc: Move tracking of layer_property_changed to main thread (3)

cc/layers/layer_proto_converter_unittest.cc

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 fbd13e12fa1ec74d94314434590985cfc2d0f0b7..d0d299f354cc55af891eb334007ed5b9abf72d4b 100644
--- a/cc/layers/layer_proto_converter_unittest.cc
+++ b/cc/layers/layer_proto_converter_unittest.cc
@@ -189,12 +189,46 @@ TEST_F(LayerProtoConverterTest, RecursivePropertiesSerialization) {
   layer_src_b->SetMaskLayer(layer_src_b_mask.get());
   layer_src_b->SetReplicaLayer(layer_src_b_replica.get());
 
+  proto::LayerUpdate layer_update;
+  LayerProtoConverter::SerializeLayerProperties(layer_src_root.get(),
+                                                &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);
+  layer_update.Clear();
+
   layer_src_a->SetNeedsPushProperties();
   layer_src_b->SetNeedsPushProperties();
   layer_src_b_mask->SetNeedsPushProperties();
   layer_src_d->SetNeedsPushProperties();
 
-  proto::LayerUpdate layer_update;
   LayerProtoConverter::SerializeLayerProperties(layer_src_root.get(),
                                                 &layer_update);
 
@@ -217,13 +251,13 @@ TEST_F(LayerProtoConverterTest, RecursivePropertiesSerialization) {
   // 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());
-  proto::LayerProperties dest_root = layer_update.layers(0);
+  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);
+  dest_a = layer_update.layers(1);
   EXPECT_EQ(layer_src_b->id(), layer_update.layers(2).id());
-  proto::LayerProperties dest_b = layer_update.layers(2);
+  dest_b = layer_update.layers(2);
   EXPECT_EQ(layer_src_d->id(), layer_update.layers(3).id());
-  proto::LayerProperties dest_d = layer_update.layers(3);
+  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);
 
@@ -268,10 +302,17 @@ TEST_F(LayerProtoConverterTest, RecursivePropertiesSerializationSingleChild) {
   layer_src_b->AddChild(layer_src_c);
   layer_src_b->SetMaskLayer(layer_src_b_mask.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());
+  layer_update.Clear();
+
   layer_src_b->SetNeedsPushProperties();
   layer_src_b_mask->SetNeedsPushProperties();
 
-  proto::LayerUpdate layer_update;
   LayerProtoConverter::SerializeLayerProperties(layer_src_root.get(),
                                                 &layer_update);