cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

content/renderer/pepper/pepper_graphics_2d_host.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 "content/renderer/pepper/pepper_graphics_2d_host.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 541 matching lines @@
     PP_Resource image,
     const PP_Point& top_left) {
   context->reply_msg = PpapiPluginMsg_Graphics2D_ReadImageDataAck();
   return ReadImageData(image, &top_left) ? PP_OK : PP_ERROR_FAILED;
 }
 
 void ReleaseCallback(scoped_ptr<base::SharedMemory> memory,
                      unsigned sync_point,
                      bool lost_resource) {}
 
-bool PepperGraphics2DHost::PrepareTextureMailbox(cc::TextureMailbox* mailbox) {
+bool PepperGraphics2DHost::PrepareTextureMailbox(
+    cc::TextureMailbox* mailbox,
+    scoped_ptr<cc::ScopedReleaseCallback>* release_callback) {
   if (!texture_mailbox_modified_)
     return false;
   // TODO(jbauman): Send image_data_ through mailbox to avoid copy.
   gfx::Size pixel_image_size(image_data_->width(), image_data_->height());
   int buffer_size = pixel_image_size.GetArea() * 4;
   scoped_ptr<base::SharedMemory> memory =
       RenderThread::Get()->HostAllocateSharedMemoryBuffer(buffer_size);
   if (!memory || !memory->Map(buffer_size))
     return false;
   void* src = image_data_->Map();
   memcpy(memory->memory(), src, buffer_size);
   image_data_->Unmap();
 
   base::SharedMemory* mem = memory.get();
-  *mailbox =
-      cc::TextureMailbox(mem,
-                         pixel_image_size,
-                         base::Bind(&ReleaseCallback, base::Passed(&memory)));
+  *mailbox = cc::TextureMailbox(mem, pixel_image_size);

[piman, 2013/09/14 01:51:33]

nit: you can now replace mem by memory.get(), saving one line and an ugly
abbreviated name.

[danakj, 2013/09/16 16:42:21]

Done.

+  *release_callback = cc::ScopedReleaseCallback::Create(
+      base::Bind(&ReleaseCallback, base::Passed(&memory)));
   texture_mailbox_modified_ = false;
   return true;
 }
 
 void PepperGraphics2DHost::AttachedToNewLayer() {
   texture_mailbox_modified_ = true;
 }
 
 int32_t PepperGraphics2DHost::Flush(PP_Resource* old_image_data) {
   bool done_replace_contents = false;
@@ skipping 203 matching lines @@
     gfx::Point inverse_scaled_point =
         gfx::ToFlooredPoint(gfx::ScalePoint(*delta, inverse_scale));
     if (original_delta != inverse_scaled_point)
       return false;
   }
 
   return true;
 }
 
 }  // namespace content