cc: Compute mask draw properties directly

cc/trees/property_tree_builder.cc

 // Copyright 2014 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/trees/property_tree_builder.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 458 matching lines @@
       gfx::Transform to_parent;
       data_from_ancestor.property_trees->transform_tree.ComputeTransform(
           source_index, parent_index, &to_parent);
       source_to_parent = to_parent.To2dTranslation();
     }
     layer->set_offset_to_transform_parent(source_offset + source_to_parent +
                                           local_offset);
     layer->set_should_flatten_transform_from_property_tree(
         data_from_ancestor.should_flatten);
     layer->SetTransformTreeIndex(parent_index);
-    if (layer->mask_layer())
-      layer->mask_layer()->SetTransformTreeIndex(parent_index);
     return false;
   }
 
   data_for_children->property_trees->transform_tree.Insert(TransformNode(),
                                                            parent_index);
 
   TransformNode* node =
       data_for_children->property_trees->transform_tree.back();
   layer->SetTransformTreeIndex(node->id);
   data_for_children->property_trees->transform_id_to_index_map[layer->id()] =
       node->id;
-  if (layer->mask_layer())
-    layer->mask_layer()->SetTransformTreeIndex(node->id);
 
   node->data.scrolls = is_scrollable;
   node->data.flattens_inherited_transform = data_for_children->should_flatten;
 
   node->data.sorting_context_id = layer->sorting_context_id();
 
   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;
@@ skipping 548 matching lines @@
 static void SetLayerPropertyChangedForChild(LayerImpl* parent,
                                             LayerImpl* child) {}
 
 template <typename LayerType>
 void BuildPropertyTreesInternal(
     LayerType* layer,
     const DataForRecursion<LayerType>& data_from_parent,
     DataForRecursionFromChild<LayerType>* data_to_parent) {
   layer->set_property_tree_sequence_number(
       data_from_parent.property_trees->sequence_number);
-  if (layer->mask_layer())
-    layer->mask_layer()->set_property_tree_sequence_number(
-        data_from_parent.property_trees->sequence_number);
 
   DataForRecursion<LayerType> data_for_children(data_from_parent);
 
   bool created_render_surface =
       AddEffectNodeIfNeeded(data_from_parent, layer, &data_for_children);
 
   if (created_render_surface) {
     data_for_children.render_target = data_for_children.effect_tree_parent;
     layer->set_draw_blend_mode(SkXfermode::kSrcOver_Mode);
   } else {
@@ skipping 40 matching lines @@
     }
   }
 
   if (layer->has_replica()) {
     DataForRecursionFromChild<LayerType> data_from_child;
     BuildPropertyTreesInternal(layer->replica_layer(), data_for_children,
                                &data_from_child);
     data_to_parent->Merge(data_from_child);
   }
 
+  if (layer->mask_layer()) {
+    layer->mask_layer()->set_property_tree_sequence_number(
+        data_from_parent.property_trees->sequence_number);
+    layer->mask_layer()->set_offset_to_transform_parent(
+        layer->offset_to_transform_parent());
+    layer->mask_layer()->SetTransformTreeIndex(layer->transform_tree_index());
+    layer->mask_layer()->SetClipTreeIndex(layer->clip_tree_index());
+    layer->mask_layer()->SetEffectTreeIndex(layer->effect_tree_index());
+    layer->mask_layer()->SetScrollTreeIndex(layer->scroll_tree_index());
+  }
+
   EffectNode* effect_node = data_for_children.property_trees->effect_tree.Node(
       data_for_children.effect_tree_parent);
 
   if (effect_node->owner_id == layer->id()) {
     if (effect_node->data.has_copy_request)
       data_to_parent->num_copy_requests_in_subtree++;
     effect_node->data.num_copy_requests_in_subtree =
         data_to_parent->num_copy_requests_in_subtree;
   }
 }
@@ skipping 185 matching lines @@
   if (SkColorGetA(color) != 255)
     color = SkColorSetA(color, 255);
   BuildPropertyTreesTopLevelInternal(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, overscroll_elasticity_layer,
       elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
       device_transform, property_trees, color);
 }
 
 }  // namespace cc