Index: cc/layers/texture_layer_impl.h |
diff --git a/cc/layers/texture_layer_impl.h b/cc/layers/texture_layer_impl.h |
index bee739ab06f5f83baf534b31047ce0d86fbb7395..c676a5eb8dcb17464487c8ee957be4a51919722c 100644 |
--- a/cc/layers/texture_layer_impl.h |
+++ b/cc/layers/texture_layer_impl.h |
@@ -65,7 +65,9 @@ class CC_EXPORT TextureLayerImpl : public LayerImpl { |
TextureLayerImpl(LayerTreeImpl* tree_impl, int id, bool uses_mailbox); |
virtual const char* LayerTypeAsString() const OVERRIDE; |
- void FreeTextureMailbox(); |
+ void FreeMailbox(); |
danakj
2013/05/23 15:34:33
Keep this name as TextureMailbox as well for the s
slavi
2013/05/28 18:55:13
Done.
|
+ |
+ const bool uses_mailbox_; |
danakj
2013/05/23 15:34:33
no const, no need to move this variable either - j
slavi
2013/05/28 18:55:13
Done.
|
unsigned texture_id_; |
ResourceProvider::ResourceId external_texture_resource_; |
@@ -75,8 +77,7 @@ class CC_EXPORT TextureLayerImpl : public LayerImpl { |
gfx::PointF uv_bottom_right_; |
float vertex_opacity_[4]; |
- TextureMailbox texture_mailbox_; |
- bool uses_mailbox_; |
+ TextureMailbox mailbox_; |
danakj
2013/05/23 15:34:33
keep the old name
slavi
2013/05/28 18:55:13
Done.
|
bool own_mailbox_; |
DISALLOW_COPY_AND_ASSIGN(TextureLayerImpl); |