| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index 056ce2fc6f60c99b59373e73cefdefa60c0128d3..c7c0f5f4876a2cc2be8538c0a079c66c147af62a 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -416,30 +416,30 @@ class CC_EXPORT ResourceProvider {
|
| int lock_for_read_count;
|
| int imported_count;
|
| int exported_count;
|
| - bool locked_for_write;
|
| - Origin origin;
|
| - bool marked_for_deletion;
|
| - bool pending_set_pixels;
|
| - bool set_pixels_completion_forced;
|
| - bool allocated;
|
| - bool enable_read_lock_fences;
|
| + bool dirty_image : 1;
|
| + bool locked_for_write : 1;
|
| + bool lost : 1;
|
| + bool marked_for_deletion : 1;
|
| + bool pending_set_pixels : 1;
|
| + bool set_pixels_completion_forced : 1;
|
| + bool allocated : 1;
|
| + bool enable_read_lock_fences : 1;
|
| + bool has_shared_bitmap_id : 1;
|
| + bool allow_overlay : 1;
|
| scoped_refptr<Fence> read_lock_fence;
|
| gfx::Size size;
|
| + Origin origin;
|
| GLenum target;
|
| // TODO(skyostil): Use a separate sampler object for filter state.
|
| GLenum original_filter;
|
| GLenum filter;
|
| unsigned image_id;
|
| unsigned bound_image_id;
|
| - bool dirty_image;
|
| GLenum texture_pool;
|
| GLint wrap_mode;
|
| - bool lost;
|
| TextureUsageHint hint;
|
| ResourceType type;
|
| ResourceFormat format;
|
| - bool has_shared_bitmap_id;
|
| - bool allow_overlay;
|
| SharedBitmapId shared_bitmap_id;
|
| SharedBitmap* shared_bitmap;
|
| linked_ptr<DirectRasterBuffer> direct_raster_buffer;
|
|
|