cc : Update render surfaces using LayerListIterator instead of treewalk

cc/trees/draw_property_utils.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/draw_property_utils.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 434 matching lines @@
     if (LayerType* mask_layer = replica_layer->mask_layer())
       update_layer_list->push_back(mask_layer);
   }
 
   for (size_t i = 0; i < layer->children().size(); ++i) {
     FindLayersThatNeedUpdates(layer->child_at(i), transform_tree, effect_tree,
                               update_layer_list, visible_layer_list);
   }
 }
 
-template <typename LayerType>
 void UpdateRenderSurfacesWithEffectTreeInternal(EffectTree* effect_tree,
-                                                LayerType* layer) {
+                                                Layer* layer) {
   EffectNode* node = effect_tree->Node(layer->effect_tree_index());
 
   if (node->owner_id == layer->id() && node->data.has_render_surface)
     layer->SetHasRenderSurface(true);
   else
     layer->SetHasRenderSurface(false);
 
   for (size_t i = 0; i < layer->children().size(); ++i) {
-    UpdateRenderSurfacesWithEffectTreeInternal<LayerType>(effect_tree,
-                                                          layer->child_at(i));
+    UpdateRenderSurfacesWithEffectTreeInternal(effect_tree, layer->child_at(i));
   }
 }
 
 void UpdateRenderSurfacesWithEffectTree(EffectTree* effect_tree, Layer* layer) {
-  UpdateRenderSurfacesWithEffectTreeInternal<Layer>(effect_tree, layer);
+  UpdateRenderSurfacesWithEffectTreeInternal(effect_tree, layer);

[ajuma, 2016/03/22 14:41:54]

Since there's no templating anymore, can we remove the indirection here and just
rename UpdateRenderSurfacesWithEffectTreeInternal to
UpdateRenderSurfacesWithEffectTree?

[jaydasika, 2016/03/22 20:48:36]

Done.

 }
 
 void UpdateRenderSurfacesNonRootSurfacesDisabled(LayerImpl* layer) {

[ajuma, 2016/03/22 14:41:54]

Can this be deleted now?

[jaydasika, 2016/03/22 20:48:36]

Done.

   // Only root layer has render surface, all other layers don't.
   layer->SetHasRenderSurface(!layer->parent());
 
   for (size_t i = 0; i < layer->children().size(); ++i)
     UpdateRenderSurfacesNonRootSurfacesDisabled(layer->child_at(i));
 }
 
 void UpdateRenderSurfacesWithEffectTree(EffectTree* effect_tree,
                                         bool non_root_surfaces_enabled,
                                         LayerImpl* layer) {
-  if (!non_root_surfaces_enabled)
-    UpdateRenderSurfacesNonRootSurfacesDisabled(layer);
+  if (!non_root_surfaces_enabled) {
+    layer->SetHasRenderSurface(!layer->parent());
+    return;
+  }
+  EffectNode* node = effect_tree->Node(layer->effect_tree_index());
+
+  if (node->owner_id == layer->id() && node->data.has_render_surface)
+    layer->SetHasRenderSurface(true);
   else
-    UpdateRenderSurfacesWithEffectTreeInternal<LayerImpl>(effect_tree, layer);
+    layer->SetHasRenderSurface(false);

[ajuma, 2016/03/22 14:41:55]

To avoid code duplication, how about turning this logic into a (templated)
UpdateRenderSurfaceForLayer that's called while recursing over the layer tree
for Layer and while iterating over the tree for LayerImpl?

[jaydasika, 2016/03/22 20:48:34]

Done.

 }
 
 }  // namespace
 
 static void ResetIfHasNanCoordinate(gfx::RectF* rect) {
   if (std::isnan(rect->x()) || std::isnan(rect->y()) ||
       std::isnan(rect->right()) || std::isnan(rect->bottom()))
     *rect = gfx::RectF();
 }
 
@@ skipping 233 matching lines @@
   std::vector<Layer*> visible_layer_list;
   ComputeVisibleRectsInternal(root_layer, property_trees,
                               can_render_to_separate_surface, update_layer_list,
                               &visible_layer_list);
 }
 
 void ComputeVisibleRects(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);
+  for (auto* layer : *root_layer->layer_tree_impl())
+    UpdateRenderSurfacesWithEffectTree(&property_trees->effect_tree,
+                                       can_render_to_separate_surface, layer);
   if (can_render_to_separate_surface)
     ValidateRenderSurfaces(root_layer);
   LayerImplList update_layer_list;
   ComputeVisibleRectsInternal(root_layer, property_trees,
                               can_render_to_separate_surface,
                               &update_layer_list, visible_layer_list);
 }
 
 template <typename LayerType>
 static gfx::Transform DrawTransformInternal(const LayerType* layer,
@@ skipping 375 matching lines @@
 void UpdateElasticOverscroll(PropertyTrees* property_trees,
                              const Layer* overscroll_elasticity_layer,
                              const gfx::Vector2dF& elastic_overscroll) {
   UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
                                   elastic_overscroll);
 }
 
 }  // namespace draw_property_utils
 
 }  // namespace cc