Revert of Determine a layer's IsAffectedByPageScale property without using Layer Tree

cc/trees/property_tree_builder.cc

Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 3de10816c6d0b06bcdedace2f6bfd9db72c678f9..3a41a56d3320d51fd589abfa31e7aee30d87ee84 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -318,9 +318,6 @@
 
   node->data.scrolls = is_scrollable;
   node->data.flattens_inherited_transform = data_for_children->should_flatten;
-
-  if (layer == data_from_ancestor.page_scale_layer)
-    data_for_children->in_subtree_of_page_scale_layer = true;
   node->data.in_subtree_of_page_scale_layer =
       data_for_children->in_subtree_of_page_scale_layer;
 
@@ -631,10 +628,6 @@
     LayerType* layer,
     const DataForRecursion<LayerType>& data_from_parent) {
   layer->set_property_tree_sequence_number(data_from_parent.sequence_number);
-  if (layer->mask_layer())
-    layer->mask_layer()->set_property_tree_sequence_number(
-        data_from_parent.sequence_number);
-
   DataForRecursion<LayerType> data_for_children(data_from_parent);
 
   bool created_render_surface =
@@ -651,6 +644,9 @@
       data_from_parent, layer, created_render_surface, &data_for_children);
   AddClipNodeIfNeeded(data_from_parent, layer, created_render_surface,
                       created_transform_node, &data_for_children);
+
+  if (layer == data_from_parent.page_scale_layer)
+    data_for_children.in_subtree_of_page_scale_layer = true;
 
   data_for_children.is_hidden =
       layer->hide_layer_and_subtree() || data_from_parent.is_hidden;