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

cc/layers/layer_proto_converter_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/layer_proto_converter.h"
 
 #include "cc/layers/empty_content_layer_client.h"
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_settings.h"
@@ skipping 171 matching lines @@
   scoped_refptr<Layer> layer_src_b_replica = Layer::Create(LayerSettings());
   scoped_refptr<Layer> layer_src_c = Layer::Create(LayerSettings());
   scoped_refptr<Layer> layer_src_d = Layer::Create(LayerSettings());
   layer_src_root->AddChild(layer_src_a);
   layer_src_root->AddChild(layer_src_b);
   layer_src_a->AddChild(layer_src_c);
   layer_src_b->AddChild(layer_src_d);
   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);
 
   // 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());
-  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);
 
   // 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());
@@ skipping 24 matching lines @@
      Layer b also has a mask layer.
   */
   scoped_refptr<Layer> layer_src_root = Layer::Create(LayerSettings());
   scoped_refptr<Layer> layer_src_b = Layer::Create(LayerSettings());
   scoped_refptr<Layer> layer_src_b_mask = Layer::Create(LayerSettings());
   scoped_refptr<Layer> layer_src_c = Layer::Create(LayerSettings());
   layer_src_root->AddChild(layer_src_b);
   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);
 
   // 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());
@@ skipping 146 matching lines @@
 
   // Check that the layer type is equal by using the type this layer would
   // serialize to.
   proto::LayerNode layer_node;
   new_root->SetTypeForProtoSerialization(&layer_node);
   EXPECT_EQ(proto::LayerType::HEADS_UP_DISPLAY_LAYER, layer_node.type());
 }
 
 }  // namespace
 }  // namespace cc