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

Unified Diff: cc/output/copy_output_request.cc

Issue 23648014: cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: releasecallback: missingfiles 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
Index: cc/output/copy_output_request.cc
diff --git a/cc/output/copy_output_request.cc b/cc/output/copy_output_request.cc
index 995c3f4cfcc90117950b9b315eea46ac90476303..cd9cf191ae1c4b9845399edfae2ad11298d7cfd9 100644
--- a/cc/output/copy_output_request.cc
+++ b/cc/output/copy_output_request.cc
@@ -8,6 +8,7 @@
#include "base/callback_helpers.h"
#include "base/logging.h"
#include "cc/output/copy_output_result.h"
+#include "cc/resources/scoped_release_callback.h"
#include "cc/resources/texture_mailbox.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -40,11 +41,13 @@ void CopyOutputRequest::SendBitmapResult(scoped_ptr<SkBitmap> bitmap) {
SendResult(CopyOutputResult::CreateBitmapResult(bitmap.Pass()).Pass());
}
-void CopyOutputRequest::SendTextureResult(gfx::Size size,
- scoped_ptr<TextureMailbox> texture) {
- DCHECK(texture->IsTexture());
- SendResult(CopyOutputResult::CreateTextureResult(size,
- texture.Pass()).Pass());
+void CopyOutputRequest::SendTextureResult(
+ gfx::Size size,
+ const TextureMailbox& texture_mailbox,
+ ScopedReleaseCallback release_callback) {
+ DCHECK(texture_mailbox.IsTexture());
+ SendResult(CopyOutputResult::CreateTextureResult(
+ size, texture_mailbox, release_callback.Pass()));
}
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698