Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5053)

Unified Diff: cc/output/gl_renderer.cc

Issue 23648014: cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: releasecallback: SingleReleaseCallback Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/copy_output_result.cc ('k') | cc/resources/release_callback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 0b56c9d400ac7158bf4ac5eefc1139fd818d2ec8..074d603b909daa5cff3e99bc5b424d43d26fd54b 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -2221,13 +2221,13 @@ void GLRenderer::GetFramebufferPixelsAsync(
GL_TEXTURE_2D, mailbox.name));
GLC(context_, context_->bindTexture(GL_TEXTURE_2D, 0));
sync_point = context_->insertSyncPoint();
- scoped_ptr<TextureMailbox> texture_mailbox = make_scoped_ptr(
- new TextureMailbox(mailbox,
- texture_mailbox_deleter_->GetReleaseCallback(
- output_surface_->context_provider(), texture_id),
- GL_TEXTURE_2D,
- sync_point));
- request->SendTextureResult(window_rect.size(), texture_mailbox.Pass());
+ TextureMailbox texture_mailbox(mailbox, GL_TEXTURE_2D, sync_point);
+ scoped_ptr<SingleReleaseCallback> release_callback =
+ texture_mailbox_deleter_->GetReleaseCallback(
+ output_surface_->context_provider(), texture_id);
+ request->SendTextureResult(window_rect.size(),
+ texture_mailbox,
+ release_callback.Pass());
return;
}
« no previous file with comments | « cc/output/copy_output_result.cc ('k') | cc/resources/release_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698