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

ui/compositor/layer.cc

Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 2da468a5b48ca5f69c8ebe98ead61cfa42ba8b11..a1184dd51f4cb6d79234a5c8b9ea62c97c1c3bf7 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -522,29 +522,20 @@ cc::TextureMailbox Layer::GetTextureMailbox(float* scale_factor) {
   return mailbox_;
 }
 
-void Layer::SetDelegatedFrame(scoped_ptr<cc::DelegatedFrameData> frame,
-                              gfx::Size frame_size_in_dip) {
-  DCHECK(frame && !frame->render_pass_list.empty());
-
+void Layer::SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider,
+                                    gfx::Size frame_size_in_dip) {
   DCHECK_EQ(type_, LAYER_TEXTURED);
+
+  scoped_refptr<cc::DelegatedRendererLayer> new_layer =
+      cc::DelegatedRendererLayer::Create(NULL, frame_provider);
+  SwitchToLayer(new_layer);
+  delegated_renderer_layer_ = new_layer;
   layer_updated_externally_ = true;
+
   delegated_frame_size_in_dip_ = frame_size_in_dip;
-  if (!delegated_renderer_layer_.get()) {
-    scoped_refptr<cc::DelegatedRendererLayer> new_layer =
-        cc::DelegatedRendererLayer::Create(NULL);
-    SwitchToLayer(new_layer);
-    delegated_renderer_layer_ = new_layer;
-  }
-  delegated_renderer_layer_->SetFrameData(frame.Pass());
   RecomputeDrawsContentAndUVRect();
 }
 
-void Layer::TakeUnusedResourcesForChildCompositor(
-    cc::ReturnedResourceArray* list) {
-  if (delegated_renderer_layer_.get())
-    delegated_renderer_layer_->TakeUnusedResourcesForChildCompositor(list);
-}
-
 void Layer::SetShowPaintedContent() {
   if (content_layer_.get())
     return;