cc: Return resources to child compositor via a Callback.

cc/layers/delegated_renderer_layer_impl.h

 // Copyright 2012 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_DELEGATED_RENDERER_LAYER_IMPL_H_
 #define CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ skipping 22 matching lines @@
       RenderPass::Id previous) const OVERRIDE;
   virtual void DidLoseOutputSurface() OVERRIDE;
   virtual bool WillDraw(DrawMode draw_mode,
                         ResourceProvider* resource_provider) OVERRIDE;
   virtual void AppendQuads(QuadSink* quad_sink,
                            AppendQuadsData* append_quads_data) OVERRIDE;
   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
 
   void AppendContributingRenderPasses(RenderPassSink* render_pass_sink);
 
+  // Creates an ID with the resource provider for the child renderer
+  // that will be sending quads to the layer. Registers the callback to
+  // inform when resources are no longer in use.
+  void CreateChildIdIfNeeded(const ReturnCallback& return_callback);
+
   void SetFrameData(scoped_ptr<DelegatedFrameData> frame_data,
                     gfx::RectF damage_in_frame);
 
-  void CollectUnusedResources(ReturnedResourceArray* resources_for_ack);
-
   void SetDisplaySize(gfx::Size size);
 
  protected:
   DelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, int id);
 
   int ChildIdForTesting() const { return child_id_; }
   const ScopedPtrVector<RenderPass>& RenderPassesInDrawOrderForTesting() const {
     return render_passes_in_draw_order_;
   }
-  const ResourceProvider::ResourceIdSet& ResourcesForTesting() const {
+  const ResourceProvider::ResourceIdArray& ResourcesForTesting() const {
     return resources_;
   }
 
  private:
-  // Creates an ID with the resource provider for the child renderer
-  // that will be sending quads to the layer.
-  void CreateChildIdIfNeeded();
   void ClearChildId();
 
   void AppendRainbowDebugBorder(QuadSink* quad_sink,
                                 AppendQuadsData* append_quads_data);
 
   void SetRenderPasses(
       ScopedPtrVector<RenderPass>* render_passes_in_draw_order);
   void ClearRenderPasses();
 
   // Returns |true| if the delegated_render_pass_id is part of the current
@@ skipping 10 matching lines @@
       AppendQuadsData* append_quads_data,
       const RenderPass* delegated_render_pass,
       gfx::Size frame_size) const;
 
   // LayerImpl overrides.
   virtual const char* LayerTypeAsString() const OVERRIDE;
 
   bool have_render_passes_to_push_;
   ScopedPtrVector<RenderPass> render_passes_in_draw_order_;
   base::hash_map<RenderPass::Id, int> render_passes_index_by_id_;
-  ResourceProvider::ResourceIdSet resources_;
+  ResourceProvider::ResourceIdArray resources_;
 
   gfx::Size display_size_;
   int child_id_;
   bool own_child_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatedRendererLayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_