cc: Move render surface ownership from layers to the effect tree

cc/trees/property_tree.h

 // 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.
 
 #ifndef CC_TREES_PROPERTY_TREE_H_
 #define CC_TREES_PROPERTY_TREE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 280 matching lines @@
 class CC_EXPORT EffectTree final : public PropertyTree<EffectNode> {
  public:
   EffectTree();
   ~EffectTree();
 
   EffectTree& operator=(const EffectTree& from);
   bool operator==(const EffectTree& other) const;
 
   static const int kContentsRootNodeId = 1;
 
+  int Insert(const EffectNode& tree_node, int parent_id);
+
   void clear();
 
   float EffectiveOpacity(const EffectNode* node) const;
 
   void UpdateSurfaceContentsScale(EffectNode* node);
 
   void OnOpacityAnimated(float opacity, int id, LayerTreeImpl* layer_tree_impl);
   void OnFilterAnimated(const FilterOperations& filters,
                         int id,
                         LayerTreeImpl* layer_tree_impl);
 
   void UpdateEffects(int id);
 
   void UpdateEffectChanged(EffectNode* node, EffectNode* parent_node);
 
   void AddCopyRequest(int node_id, std::unique_ptr<CopyOutputRequest> request);
   void PushCopyRequestsTo(EffectTree* other_tree);
   void TakeCopyRequestsAndTransformToSurface(
       int node_id,
       std::vector<std::unique_ptr<CopyOutputRequest>>* requests);
   bool HasCopyRequests() const;
   void ClearCopyRequests();
 
   int ClosestAncestorWithCopyRequest(int id) const;
 
   void AddMaskLayerId(int id);
   const std::vector<int>& mask_layer_ids() const { return mask_layer_ids_; }
 
+  RenderSurfaceImpl* GetRenderSurface(int id) {
+    return render_surfaces_[id].get();
+  }
+
+  const RenderSurfaceImpl* GetRenderSurface(int id) const {
+    return render_surfaces_[id].get();
+  }
+
+  void UpdateRenderSurfaces(LayerTreeImpl* layer_tree_impl,
+                            bool non_root_surfaces_enabled);
+
   bool ContributesToDrawnSurface(int id);
 
   void ResetChangeTracking();
 
-  // A list of pairs of stable id and render surface, sorted by stable id.
-  using StableIdRenderSurfaceList =
-      std::vector<std::pair<int, RenderSurfaceImpl*>>;
-  StableIdRenderSurfaceList CreateStableIdRenderSurfaceList() const;
-  void UpdateRenderSurfaceEffectIds(
-      const StableIdRenderSurfaceList& stable_id_render_surface_list,
+  void TakeRenderSurfaces(
+      std::vector<std::unique_ptr<RenderSurfaceImpl>>* render_surfaces);
+
+  // Returns true if render surfaces changed (that is, if any render surfaces
+  // were created or destroyed).
+  bool CreateOrReuseRenderSurfaces(
+      std::vector<std::unique_ptr<RenderSurfaceImpl>>* old_render_surfaces,
       LayerTreeImpl* layer_tree_impl);
 
  private:
   void UpdateOpacities(EffectNode* node, EffectNode* parent_node);
   void UpdateIsDrawn(EffectNode* node, EffectNode* parent_node);
   void UpdateBackfaceVisibility(EffectNode* node, EffectNode* parent_node);
 
   // Stores copy requests, keyed by node id.
   std::unordered_multimap<int, std::unique_ptr<CopyOutputRequest>>
       copy_requests_;
 
   // Unsorted list of all mask layer ids that effect nodes refer to.
   std::vector<int> mask_layer_ids_;
+
+  // Indexed by node id.
+  std::vector<std::unique_ptr<RenderSurfaceImpl>> render_surfaces_;
 };
 
 class CC_EXPORT ScrollTree final : public PropertyTree<ScrollNode> {
  public:
   ScrollTree();
   ~ScrollTree();
 
   ScrollTree& operator=(const ScrollTree& from);
   bool operator==(const ScrollTree& other) const;
 
@@ skipping 291 matching lines @@
   DrawTransforms& GetDrawTransforms(int transform_id, int effect_id) const;
   DrawTransformData& FetchDrawTransformsDataFromCache(int transform_id,
                                                       int effect_id) const;
 
   PropertyTreesCachedData cached_data_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROPERTY_TREE_H_