aura: Allow delegated frames to be used by more than one impl layer.

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index d308f607716629d1d0c2ea0cb6f74b39652bc062..2d21b9805dfaf5e289ec262e26421eaa76d4e864 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -33,7 +33,7 @@ class SkCanvas;
 namespace cc {
 class ContentLayer;
 class CopyOutputRequest;
-class DelegatedFrameData;
+class DelegatedFrameProvider;
 class DelegatedRendererLayer;
 class Layer;
 class ResourceUpdateQueue;
@@ -261,18 +261,14 @@ class COMPOSITOR_EXPORT Layer
                          float scale_factor);
   cc::TextureMailbox GetTextureMailbox(float* scale_factor);
 
-  // Sets a delegated frame, coming from a child compositor.
-  void SetDelegatedFrame(scoped_ptr<cc::DelegatedFrameData> frame,
-                         gfx::Size frame_size_in_dip);
+  // Begins showing delegated frames from the |frame_provider|.
+  void SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider,
+                               gfx::Size frame_size_in_dip);
 
   bool has_external_content() {
     return texture_layer_.get() || delegated_renderer_layer_.get();
   }
 
-  // Gets unused resources to recycle to the child compositor.
-  void TakeUnusedResourcesForChildCompositor(
-      cc::ReturnedResourceArray* array);
-
   void SetShowPaintedContent();
 
   // Sets the layer's fill color.  May only be called for LAYER_SOLID_COLOR.
@@ -494,8 +490,8 @@ class COMPOSITOR_EXPORT Layer
   // Device scale factor in which mailbox_ was rendered in.
   float mailbox_scale_factor_;
 
-  // The size of the delegated frame in DIP, set when SetDelegatedFrame was
-  // called.
+  // The size of the delegated frame in DIP, set when SetShowDelegatedContent
+  // was called.
   gfx::Size delegated_frame_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);