cc: Receive and remap resources to the parent.

cc/delegated_renderer_layer_impl.h

Index: cc/delegated_renderer_layer_impl.h
diff --git a/cc/delegated_renderer_layer_impl.h b/cc/delegated_renderer_layer_impl.h
index 1b4000853c7fce6ea0e058c3268e213ef77b5b0a..cf23d8c34f93a3b5f5f58f43d7ceb4a3120b8d54 100644
--- a/cc/delegated_renderer_layer_impl.h
+++ b/cc/delegated_renderer_layer_impl.h
@@ -33,22 +33,29 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
       QuadSink& quad_sink, AppendQuadsData& append_quads_data) OVERRIDE;
 
   // TODO(danakj): Make private
-  // This gives ownership of the RenderPasses to the layer.
   void SetRenderPasses(ScopedPtrVector<RenderPass>&);
   void ClearRenderPasses();
 
   void AppendContributingRenderPasses(RenderPassSink* render_pass_sink);
 
-  void SetFrameData(scoped_ptr<DelegatedFrameData> frame_data,
-                    gfx::RectF damage_in_frame);
+  virtual void SetFrameData(scoped_ptr<DelegatedFrameData> frame_data,
+                            gfx::RectF damage_in_frame,
+                            TransferableResourceArray* resources_for_ack);
 
   void SetDisplaySize(gfx::Size size);
 
-  int child_id() const { return child_id_; }
-
- private:
+ 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 {
+    return resources_;
+  }
+
+ private:
   // Creates an ID with the resource provider for the child renderer
   // that will be sending quads to the layer.
   void CreateChildIdIfNeeded();
@@ -71,6 +78,7 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
 
   ScopedPtrVector<RenderPass> render_passes_in_draw_order_;
   base::hash_map<RenderPass::Id, int> render_passes_index_by_id_;
+  ResourceProvider::ResourceIdSet resources_;
 
   gfx::Size display_size_;
   int child_id_;