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

ui/compositor/layer.cc

 // Copyright (c) 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.
 
 #include "ui/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 504 matching lines @@
   mailbox_scale_factor_ = scale_factor;
   RecomputeDrawsContentAndUVRect();
 }
 
 cc::TextureMailbox Layer::GetTextureMailbox(float* scale_factor) {
   if (scale_factor)
     *scale_factor = mailbox_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);
 
-  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;
 
   scoped_refptr<cc::ContentLayer> new_layer = cc::ContentLayer::Create(this);
   SwitchToLayer(new_layer);
   content_layer_ = new_layer;
 
   layer_updated_externally_ = false;
   mailbox_ = cc::TextureMailbox();
@@ skipping 414 matching lines @@
   cc_layer_->SetBounds(ConvertSizeToPixel(this, size));
 }
 
 void Layer::RecomputePosition() {
   cc_layer_->SetPosition(gfx::ScalePoint(
         gfx::PointF(bounds_.x(), bounds_.y()),
         device_scale_factor_));
 }
 
 }  // namespace ui