cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

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 485 matching lines @@
     } else {
       scoped_refptr<cc::ContentLayer> new_layer =
           cc::ContentLayer::Create(this);
       SwitchToLayer(new_layer);
       content_layer_ = new_layer;
     }
   }
   RecomputeDrawsContentAndUVRect();
 }
 
-void Layer::SetTextureMailbox(const cc::TextureMailbox& mailbox,
-                              float scale_factor) {
+void Layer::SetTextureMailbox(
+    const cc::TextureMailbox& mailbox,
+    scoped_ptr<cc::ScopedReleaseCallback> release_callback,
+    float scale_factor) {
   DCHECK_EQ(type_, LAYER_TEXTURED);
   DCHECK(!solid_color_layer_.get());
   layer_updated_externally_ = true;
   texture_ = NULL;
   if (!texture_layer_.get() || !texture_layer_->uses_mailbox()) {
     scoped_refptr<cc::TextureLayer> new_layer =
         cc::TextureLayer::CreateForMailbox(this);
     new_layer->SetFlipped(false);
     SwitchToLayer(new_layer);
     texture_layer_ = new_layer;
   }
-  texture_layer_->SetTextureMailbox(mailbox);
+  texture_layer_->SetTextureMailbox(mailbox, release_callback.Pass());
   mailbox_ = mailbox;
   mailbox_scale_factor_ = scale_factor;
   RecomputeDrawsContentAndUVRect();
 }
 
 cc::TextureMailbox Layer::GetTextureMailbox(float* scale_factor) {
   if (scale_factor)
     *scale_factor = mailbox_scale_factor_;
-  cc::TextureMailbox::ReleaseCallback callback;
-  return mailbox_.CopyWithNewCallback(callback);
+  return mailbox_;
 }
 
 void Layer::SetDelegatedFrame(scoped_ptr<cc::DelegatedFrameData> frame,
                               gfx::Size frame_size_in_dip) {
   DCHECK_EQ(type_, LAYER_TEXTURED);
   bool has_frame = frame.get() && !frame->render_pass_list.empty();
   layer_updated_externally_ = has_frame;
   delegated_frame_size_in_dip_ = frame_size_in_dip;
   if (!!delegated_renderer_layer_.get() != has_frame) {
     if (has_frame) {
@@ skipping 117 matching lines @@
   return texture_->PrepareTexture();
 }
 
 WebKit::WebGraphicsContext3D* Layer::Context3d() {
   DCHECK(texture_layer_.get());
   if (texture_.get())
     return texture_->HostContext3D();
   return NULL;
 }
 
-bool Layer::PrepareTextureMailbox(cc::TextureMailbox* mailbox,
-                                  bool use_shared_memory) {
+bool Layer::PrepareTextureMailbox(
+    cc::TextureMailbox* mailbox,
+    scoped_ptr<cc::ScopedReleaseCallback>* release_callback,
+    bool use_shared_memory) {
   return false;
 }
 
 void Layer::SetForceRenderSurface(bool force) {
   if (force_render_surface_ == force)
     return;
 
   force_render_surface_ = force;
   cc_layer_->SetForceRenderSurface(force_render_surface_);
 }
@@ skipping 292 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