Create RenderSurface on Effect Tree

cc/trees/draw_property_utils.cc

Index: cc/trees/draw_property_utils.cc
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc
index 326e507fc822e6c055f19079280b42eb4706b4ed..3ce590a6bf517dd7fdbdad62e90bf7524ca40f48 100644
--- a/cc/trees/draw_property_utils.cc
+++ b/cc/trees/draw_property_utils.cc
@@ -21,6 +21,28 @@ namespace cc {
 namespace {
 
 template <typename LayerType>
+static void ValidateRenderSurfaces(LayerType* layer) {
+  for (size_t i = 0; i < layer->children().size(); ++i) {
+    ValidateRenderSurfaces(layer->child_at(i));
+  }
+
+  // This test verifies that there are no cases where a LayerImpl needs
+  // a render surface, but doesn't have one.
+  if (layer->has_render_surface())
+    return;
+
+  DCHECK(layer->filters().IsEmpty()) << "layer: " << layer->id();
+  DCHECK(layer->background_filters().IsEmpty()) << "layer: " << layer->id();
+  DCHECK(layer->parent()) << "layer: " << layer->id();
+  if (layer->parent()->replica_layer() == layer)
+    return;
+  DCHECK(!layer->mask_layer()) << "layer: " << layer->id();
+  DCHECK(!layer->replica_layer()) << "layer: " << layer->id();
+  DCHECK(!layer->is_root_for_isolated_group()) << "layer: " << layer->id();
+  DCHECK(!layer->HasCopyRequest()) << "layer: " << layer->id();
+}
+
+template <typename LayerType>
 void CalculateVisibleRects(const std::vector<LayerType*>& visible_layer_list,
                            const ClipTree& clip_tree,
                            const TransformTree& transform_tree,
@@ -438,6 +460,43 @@ void FindLayersThatNeedUpdates(
   }
 }
 
+void UpdateRenderSurfacesWithEffectTree(EffectTree* effect_tree, Layer* layer) {
+  EffectNode* effect_node = effect_tree->Node(layer->effect_tree_index());
+  if (effect_node->owner_id == layer->id() &&
+      effect_node->data.has_render_surface) {
+    layer->SetHasRenderSurface(true);
+  } else {
+    layer->SetHasRenderSurface(false);
+  }
+
+  for (size_t i = 0; i < layer->children().size(); ++i) {
+    UpdateRenderSurfacesWithEffectTree(effect_tree, layer->child_at(i));
+  }
+}
+
+void UpdateRenderSurfacesWithEffectTree(EffectTree* effect_tree,
+                                        bool non_root_surfaces_enabled,
+                                        LayerImpl* layer) {
+  EffectNode* effect_node = effect_tree->Node(layer->effect_tree_index());
+  if (!non_root_surfaces_enabled) {
+    if (!layer->parent()) {
+      layer->SetHasRenderSurface(true);
+    } else {
+      layer->SetHasRenderSurface(false);
+    }
+  } else if (effect_node->owner_id == layer->id() &&

[enne (OOO), 2015/12/04 17:39:30]

This bottom half of the function looks like a duplicate of the above.  Can you
just call UpdateRenderSurfaesWithEffectTree(effect_tree, layer) instead of this?

[weiliangc, 2015/12/04 20:28:12]

Done.

+             effect_node->data.has_render_surface) {
+    layer->SetHasRenderSurface(true);
+  } else {
+    layer->SetHasRenderSurface(false);
+  }
+
+  for (size_t i = 0; i < layer->children().size(); ++i) {
+    UpdateRenderSurfacesWithEffectTree(effect_tree, non_root_surfaces_enabled,
+                                       layer->child_at(i));
+  }
+}
+
 }  // namespace
 
 static void ResetIfHasNanCoordinate(gfx::RectF* rect) {
@@ -500,7 +559,6 @@ void ComputeClips(ClipTree* clip_tree,
           parent_to_current,
           parent_clip_node->data.combined_clip_in_target_space);
     }
-
     // Only nodes affected by ancestor clips will have their clip adjusted due
     // to intersecting with an ancestor clip. But, we still need to propagate
     // the combined clip to our children because if they are clipped, they may
@@ -523,7 +581,6 @@ void ComputeClips(ClipTree* clip_tree,
       ResetIfHasNanCoordinate(&clip_node->data.combined_clip_in_target_space);
       continue;
     }
-
     bool use_only_parent_clip = !clip_node->data.applies_local_clip;
     if (use_only_parent_clip) {
       clip_node->data.combined_clip_in_target_space =
@@ -645,6 +702,8 @@ void BuildPropertyTreesAndComputeVisibleRects(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, page_scale_factor, device_scale_factor,
       viewport, device_transform, property_trees);
+  UpdateRenderSurfacesWithEffectTree(&property_trees->effect_tree, root_layer);
+  ValidateRenderSurfaces(root_layer);
   ComputeVisibleRectsUsingPropertyTrees(root_layer, property_trees,
                                         can_render_to_separate_surface,
                                         update_layer_list);
@@ -685,6 +744,10 @@ void ComputeVisibleRectsUsingPropertyTrees(LayerImpl* root_layer,
                                            PropertyTrees* property_trees,
                                            bool can_render_to_separate_surface,
                                            LayerImplList* visible_layer_list) {
+  UpdateRenderSurfacesWithEffectTree(
+      &property_trees->effect_tree, can_render_to_separate_surface, root_layer);
+  if (can_render_to_separate_surface)
+    ValidateRenderSurfaces(root_layer);
   LayerImplList update_layer_list;
   ComputeVisibleRectsUsingPropertyTreesInternal(
       root_layer, property_trees, can_render_to_separate_surface,