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

Unified Diff: cc/resources/resource_provider.h

Issue 135273008: cc: Use ResourceProvider::Resouce::type to check the type of the given resource. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: In addition, clarify texture_pool Created 6 years, 11 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
« no previous file with comments | « no previous file | cc/resources/resource_provider.cc » ('j') | cc/resources/resource_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | cc/resources/resource_provider.cc » ('j') | cc/resources/resource_provider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698