Index: cc/resources/resource_provider.h |
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h |
index 836eae3374edeace6928305b1444f63fcde5aa28..75c9fa05b0b0f3903eba40e9d9e30e702353c159 100644 |
--- a/cc/resources/resource_provider.h |
+++ b/cc/resources/resource_provider.h |
@@ -365,8 +365,14 @@ class CC_EXPORT ResourceProvider { |
struct Resource { |
Resource(); |
~Resource(); |
+ enum Origin { |
danakj
2014/01/28 21:59:02
This seems like an odd place, in the middle of the
|
+ Internal, |
+ External, |
+ Delegated, |
+ }; |
Resource(unsigned texture_id, |
gfx::Size size, |
+ Origin origin, |
GLenum target, |
GLenum filter, |
GLenum texture_pool, |
@@ -376,6 +382,7 @@ class CC_EXPORT ResourceProvider { |
Resource(uint8_t* pixels, |
SharedBitmap* bitmap, |
gfx::Size size, |
+ Origin origin, |
GLenum filter, |
GLint wrap_mode); |
@@ -393,11 +400,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; |