Index: cc/resources/resource_provider.cc |
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc |
index 152288677ab76590f8b631d3e6e6c065a97e9661..9be4df7b166fdb78e62e8315db05cefac9a75e67 100644 |
--- a/cc/resources/resource_provider.cc |
+++ b/cc/resources/resource_provider.cc |
@@ -207,16 +207,7 @@ class QueryFence : public ResourceProvider::Fence { |
} // namespace |
ResourceProvider::Resource::Resource() |
- : child_id(0), |
- gl_id(0), |
- gl_pixel_buffer_id(0), |
- gl_upload_query_id(0), |
- gl_read_lock_query_id(0), |
- pixels(NULL), |
- lock_for_read_count(0), |
- imported_count(0), |
- exported_count(0), |
- dirty_image(false), |
+ : dirty_image(false), |
locked_for_write(false), |
lost(false), |
marked_for_deletion(false), |
@@ -226,20 +217,10 @@ ResourceProvider::Resource::Resource() |
read_lock_fences_enabled(false), |
has_shared_bitmap_id(false), |
allow_overlay(false), |
- read_lock_fence(NULL), |
- size(), |
origin(Internal), |
- target(0), |
- original_filter(0), |
- filter(0), |
- image_id(0), |
- bound_image_id(0), |
- texture_pool(0), |
- wrap_mode(0), |
hint(TextureHintImmutable), |
type(InvalidType), |
- format(RGBA_8888), |
- shared_bitmap(NULL) { |
+ format(RGBA_8888) { |
} |
ResourceProvider::Resource::~Resource() {} |
@@ -253,15 +234,7 @@ ResourceProvider::Resource::Resource(GLuint texture_id, |
GLint wrap_mode, |
TextureHint hint, |
ResourceFormat format) |
- : child_id(0), |
- gl_id(texture_id), |
- gl_pixel_buffer_id(0), |
- gl_upload_query_id(0), |
- gl_read_lock_query_id(0), |
- pixels(NULL), |
- lock_for_read_count(0), |
- imported_count(0), |
- exported_count(0), |
+ : gl_id(texture_id), |
dirty_image(false), |
locked_for_write(false), |
lost(false), |
@@ -272,20 +245,16 @@ ResourceProvider::Resource::Resource(GLuint texture_id, |
read_lock_fences_enabled(false), |
has_shared_bitmap_id(false), |
allow_overlay(false), |
- read_lock_fence(NULL), |
size(size), |
origin(origin), |
target(target), |
original_filter(filter), |
filter(filter), |
- image_id(0), |
- bound_image_id(0), |
texture_pool(texture_pool), |
wrap_mode(wrap_mode), |
hint(hint), |
type(GLTexture), |
- format(format), |
- shared_bitmap(NULL) { |
+ format(format) { |
DCHECK(wrap_mode == GL_CLAMP_TO_EDGE || wrap_mode == GL_REPEAT); |
DCHECK_EQ(origin == Internal, !!texture_pool); |
} |
@@ -296,15 +265,7 @@ ResourceProvider::Resource::Resource(uint8_t* pixels, |
Origin origin, |
GLenum filter, |
GLint wrap_mode) |
- : child_id(0), |
- gl_id(0), |
- gl_pixel_buffer_id(0), |
- gl_upload_query_id(0), |
- gl_read_lock_query_id(0), |
- pixels(pixels), |
- lock_for_read_count(0), |
- imported_count(0), |
- exported_count(0), |
+ : pixels(pixels), |
dirty_image(false), |
locked_for_write(false), |
lost(false), |
@@ -315,15 +276,10 @@ ResourceProvider::Resource::Resource(uint8_t* pixels, |
read_lock_fences_enabled(false), |
has_shared_bitmap_id(!!bitmap), |
allow_overlay(false), |
- read_lock_fence(NULL), |
size(size), |
origin(origin), |
- target(0), |
original_filter(filter), |
filter(filter), |
- image_id(0), |
- bound_image_id(0), |
- texture_pool(0), |
wrap_mode(wrap_mode), |
hint(TextureHintImmutable), |
type(Bitmap), |
@@ -340,16 +296,7 @@ ResourceProvider::Resource::Resource(const SharedBitmapId& bitmap_id, |
Origin origin, |
GLenum filter, |
GLint wrap_mode) |
- : child_id(0), |
- gl_id(0), |
- gl_pixel_buffer_id(0), |
- gl_upload_query_id(0), |
- gl_read_lock_query_id(0), |
- pixels(NULL), |
- lock_for_read_count(0), |
- imported_count(0), |
- exported_count(0), |
- dirty_image(false), |
+ : dirty_image(false), |
locked_for_write(false), |
lost(false), |
marked_for_deletion(false), |
@@ -359,21 +306,15 @@ ResourceProvider::Resource::Resource(const SharedBitmapId& bitmap_id, |
read_lock_fences_enabled(false), |
has_shared_bitmap_id(true), |
allow_overlay(false), |
- read_lock_fence(NULL), |
size(size), |
origin(origin), |
- target(0), |
original_filter(filter), |
filter(filter), |
- image_id(0), |
- bound_image_id(0), |
- texture_pool(0), |
wrap_mode(wrap_mode), |
hint(TextureHintImmutable), |
type(Bitmap), |
format(RGBA_8888), |
- shared_bitmap_id(bitmap_id), |
- shared_bitmap(NULL) { |
+ shared_bitmap_id(bitmap_id) { |
DCHECK(wrap_mode == GL_CLAMP_TO_EDGE || wrap_mode == GL_REPEAT); |
} |