| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index e2d7878415d333e2f059e7984cd849337163a2cf..2e1119ba7707062322c0b5a1564af2f65174d369 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -18,6 +18,8 @@
|
| #include "cc/base/cc_export.h"
|
| #include "cc/output/context_provider.h"
|
| #include "cc/output/output_surface.h"
|
| +#include "cc/resources/release_callback.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 +105,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,
|
| + scoped_ptr<ScopedReleaseCallback> release_callback);
|
|
|
| void DeleteResource(ResourceId id);
|
|
|
| @@ -354,6 +358,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;
|
|
|