| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index 836eae3374edeace6928305b1444f63fcde5aa28..e2582077ac84a4e3c6f08c4fdb9af22564efe44f 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -363,10 +363,17 @@ class CC_EXPORT ResourceProvider {
|
|
|
| private:
|
| struct Resource {
|
| + enum Origin {
|
| + Internal,
|
| + External,
|
| + Delegated,
|
| + };
|
| +
|
| Resource();
|
| ~Resource();
|
| Resource(unsigned texture_id,
|
| gfx::Size size,
|
| + Origin origin,
|
| GLenum target,
|
| GLenum filter,
|
| GLenum texture_pool,
|
| @@ -376,6 +383,7 @@ class CC_EXPORT ResourceProvider {
|
| Resource(uint8_t* pixels,
|
| SharedBitmap* bitmap,
|
| gfx::Size size,
|
| + Origin origin,
|
| GLenum filter,
|
| GLint wrap_mode);
|
|
|
| @@ -393,11 +401,6 @@ class CC_EXPORT ResourceProvider {
|
| int imported_count;
|
| int exported_count;
|
| bool locked_for_write;
|
| - enum Origin {
|
| - Internal,
|
| - External,
|
| - Delegated,
|
| - };
|
| Origin origin;
|
| bool marked_for_deletion;
|
| bool pending_set_pixels;
|
|
|