cc: Replace render surface layer list with a render surface list

cc/layers/render_surface_impl.h

 // Copyright 2011 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.
 
 #ifndef CC_LAYERS_RENDER_SURFACE_IMPL_H_
 #define CC_LAYERS_RENDER_SURFACE_IMPL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 86 matching lines @@
   }
 
   void set_has_contributing_layer_that_escapes_clip(
       bool contributing_layer_escapes_clip) {
     has_contributing_layer_that_escapes_clip_ = contributing_layer_escapes_clip;
   }
   bool has_contributing_layer_that_escapes_clip() const {
     return has_contributing_layer_that_escapes_clip_;
   }
 
+  void set_is_render_surface_list_member(bool is_render_surface_list_member) {
+    is_render_surface_list_member_ = is_render_surface_list_member;
+  }
+  bool is_render_surface_list_member() const {
+    return is_render_surface_list_member_;
+  }
+
   void CalculateContentRectFromAccumulatedContentRect(int max_texture_size);
   void SetContentRectToViewport();
   void SetContentRectForTesting(const gfx::Rect& rect);
   gfx::Rect content_rect() const { return draw_properties_.content_rect; }
 
   void ClearAccumulatedContentRect();
   void AccumulateContentRectFromContributingLayer(
       LayerImpl* contributing_layer);
   void AccumulateContentRectFromContributingRenderSurface(
       RenderSurfaceImpl* contributing_surface);
 
   gfx::Rect accumulated_content_rect() const {
     return accumulated_content_rect_;
   }
 
+  void increment_num_contributors() { num_contributors_++; }
+  void decrement_num_contributors() {
+    num_contributors_--;
+    DCHECK_GE(num_contributors_, 0);
+  }
+  void reset_num_contributors() { num_contributors_ = 0; }
+  int num_contributors() const { return num_contributors_; }
+
   const Occlusion& occlusion_in_content_space() const {
     return occlusion_in_content_space_;
   }
   void set_occlusion_in_content_space(const Occlusion& occlusion) {
     occlusion_in_content_space_ = occlusion;
   }
 
-  LayerImplList& layer_list() { return layer_list_; }
-  void ClearLayerLists();
-
   int id() const { return stable_effect_id_; }
 
   LayerImpl* MaskLayer();
   bool HasMask() const;
 
   const FilterOperations& Filters() const;
   const FilterOperations& BackgroundFilters() const;
   gfx::PointF FiltersOrigin() const;
   gfx::Transform SurfaceScale() const;
 
@@ skipping 55 matching lines @@
     gfx::Rect clip_rect;
 
     // True if the surface needs to be clipped by clip_rect.
     bool is_clipped : 1;
   };
 
   DrawProperties draw_properties_;
 
   // Is used to calculate the content rect from property trees.
   gfx::Rect accumulated_content_rect_;
+  int num_contributors_;
   // Is used to decide if the surface is clipped.
   bool has_contributing_layer_that_escapes_clip_ : 1;
   bool surface_property_changed_ : 1;
   bool ancestor_property_changed_ : 1;
 
   bool contributes_to_drawn_surface_ : 1;
+  bool is_render_surface_list_member_ : 1;
 
-  LayerImplList layer_list_;
   Occlusion occlusion_in_content_space_;
 
   // The nearest ancestor target surface that will contain the contents of this
   // surface, and that ignores outside occlusion. This can point to itself.
   const RenderSurfaceImpl* nearest_occlusion_immune_ancestor_;
 
   std::unique_ptr<DamageTracker> damage_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_IMPL_H_