cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

content/renderer/browser_plugin/browser_plugin_compositing_helper.cc

 // Copyright (c) 2013 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 "content/renderer/browser_plugin/browser_plugin_compositing_helper.h"
 
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/context_provider.h"
+#include "cc/resources/scoped_release_callback.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size_conversions.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
@@ skipping 210 matching lines @@
       mailbox.shared_memory != NULL : !mailbox.name.IsZero();
   if (!is_software_frame && !last_mailbox_valid_) {
     SwapBuffersInfo empty_info = mailbox;
     empty_info.name.SetZero();
     MailboxReleased(empty_info, 0, false);
     if (!current_mailbox_valid)
       return;
   }
 
   cc::TextureMailbox texture_mailbox;
+  scoped_ptr<cc::ScopedReleaseCallback> release_callback;
   if (current_mailbox_valid) {
-    cc::TextureMailbox::ReleaseCallback callback =
+    release_callback = cc::ScopedReleaseCallback::Create(
         base::Bind(&BrowserPluginCompositingHelper::MailboxReleased,
                    scoped_refptr<BrowserPluginCompositingHelper>(this),
-                   mailbox);
-    if (is_software_frame) {
-      texture_mailbox = cc::TextureMailbox(mailbox.shared_memory,
-                                           mailbox.size, callback);
-    } else {
-      texture_mailbox = cc::TextureMailbox(mailbox.name, callback, sync_point);
-    }
+                   mailbox)).Pass();
+    if (is_software_frame)
+      texture_mailbox = cc::TextureMailbox(mailbox.shared_memory, mailbox.size);
+    else
+      texture_mailbox = cc::TextureMailbox(mailbox.name, sync_point);
   }
 
   texture_layer_->SetFlipped(!is_software_frame);
-  texture_layer_->SetTextureMailbox(texture_mailbox);
+  texture_layer_->SetTextureMailbox(texture_mailbox, release_callback.Pass());
   texture_layer_->SetNeedsDisplay();
   last_mailbox_valid_ = current_mailbox_valid;
 }
 
 void BrowserPluginCompositingHelper::OnBuffersSwapped(
     const gfx::Size& size,
     const std::string& mailbox_name,
     int gpu_route_id,
     int gpu_host_id,
     float device_scale_factor) {
@@ skipping 81 matching lines @@
 }
 
 void BrowserPluginCompositingHelper::UpdateVisibility(bool visible) {
   if (texture_layer_.get())
     texture_layer_->SetIsDrawable(visible);
   if (delegated_layer_.get())
     delegated_layer_->SetIsDrawable(visible);
 }
 
 }  // namespace content