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

Unified Diff: cc/resources/resource_provider.h

Issue 23648014: cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index e2d7878415d333e2f059e7984cd849337163a2cf..e02cb9af657236f26914bc56653f0e56fa8ae9a8 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -18,6 +18,7 @@
#include "cc/base/cc_export.h"
#include "cc/output/context_provider.h"
#include "cc/output/output_surface.h"
+#include "cc/resources/scoped_release_callback.h"
#include "cc/resources/texture_mailbox.h"
#include "cc/resources/transferable_resource.h"
#include "third_party/khronos/GLES2/gl2.h"
@@ -103,7 +104,9 @@ class CC_EXPORT ResourceProvider {
unsigned texture_id);
// Wraps an external texture mailbox into a GL resource.
- ResourceId CreateResourceFromTextureMailbox(const TextureMailbox& mailbox);
+ ResourceId CreateResourceFromTextureMailbox(
+ const TextureMailbox& mailbox,
+ ScopedReleaseCallback release_callback);
void DeleteResource(ResourceId id);
@@ -354,6 +357,7 @@ class CC_EXPORT ResourceProvider {
// Query used to determine when asynchronous set pixels complete.
unsigned gl_upload_query_id;
TextureMailbox mailbox;
+ ReleaseCallback release_callback;
uint8_t* pixels;
uint8_t* pixel_buffer;
int lock_for_read_count;

Powered by Google App Engine
This is Rietveld 408576698