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

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: rebase to upstream Created 6 years, 10 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') | no next file with comments »
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 c53cf8f4dbc8209e7e4822619f67b003a40d7672..ac0baab63ac898141bbaf8c997b7db06cf90d015 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -363,10 +363,13 @@ class CC_EXPORT ResourceProvider {
private:
struct Resource {
+ enum Origin { Internal, External, Delegated };
+
Resource();
~Resource();
Resource(unsigned texture_id,
const gfx::Size& size,
+ Origin origin,
GLenum target,
GLenum filter,
GLenum texture_pool,
@@ -376,6 +379,7 @@ class CC_EXPORT ResourceProvider {
Resource(uint8_t* pixels,
SharedBitmap* bitmap,
const gfx::Size& size,
+ Origin origin,
GLenum filter,
GLint wrap_mode);
@@ -393,11 +397,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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698