Chromium Code Reviews| Index: content/renderer/pepper/pepper_graphics_2d_host.cc |
| diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc |
| index 31cdc6a872d577def0f9de4cff7dde8927346a74..3d6edca3ce01f1543558673e78c1cfa70bac7670 100644 |
| --- a/content/renderer/pepper/pepper_graphics_2d_host.cc |
| +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc |
| @@ -559,7 +559,9 @@ 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. |
| @@ -574,10 +576,9 @@ bool PepperGraphics2DHost::PrepareTextureMailbox(cc::TextureMailbox* mailbox) { |
| 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(), savi
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; |
| } |