OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CC_LAYERS_TEXTURE_LAYER_IMPL_H_ | 5 #ifndef CC_LAYERS_TEXTURE_LAYER_IMPL_H_ |
6 #define CC_LAYERS_TEXTURE_LAYER_IMPL_H_ | 6 #define CC_LAYERS_TEXTURE_LAYER_IMPL_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
58 } | 58 } |
59 | 59 |
60 virtual bool CanClipSelf() const OVERRIDE; | 60 virtual bool CanClipSelf() const OVERRIDE; |
61 | 61 |
62 void SetTextureMailbox(const TextureMailbox& mailbox); | 62 void SetTextureMailbox(const TextureMailbox& mailbox); |
63 | 63 |
64 private: | 64 private: |
65 TextureLayerImpl(LayerTreeImpl* tree_impl, int id, bool uses_mailbox); | 65 TextureLayerImpl(LayerTreeImpl* tree_impl, int id, bool uses_mailbox); |
66 | 66 |
67 virtual const char* LayerTypeAsString() const OVERRIDE; | 67 virtual const char* LayerTypeAsString() const OVERRIDE; |
68 void FreeTextureMailbox(); | 68 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.
| |
69 | |
70 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.
| |
69 | 71 |
70 unsigned texture_id_; | 72 unsigned texture_id_; |
71 ResourceProvider::ResourceId external_texture_resource_; | 73 ResourceProvider::ResourceId external_texture_resource_; |
72 bool premultiplied_alpha_; | 74 bool premultiplied_alpha_; |
73 bool flipped_; | 75 bool flipped_; |
74 gfx::PointF uv_top_left_; | 76 gfx::PointF uv_top_left_; |
75 gfx::PointF uv_bottom_right_; | 77 gfx::PointF uv_bottom_right_; |
76 float vertex_opacity_[4]; | 78 float vertex_opacity_[4]; |
77 | 79 |
78 TextureMailbox texture_mailbox_; | 80 TextureMailbox mailbox_; |
danakj
2013/05/23 15:34:33
keep the old name
slavi
2013/05/28 18:55:13
Done.
| |
79 bool uses_mailbox_; | |
80 bool own_mailbox_; | 81 bool own_mailbox_; |
81 | 82 |
82 DISALLOW_COPY_AND_ASSIGN(TextureLayerImpl); | 83 DISALLOW_COPY_AND_ASSIGN(TextureLayerImpl); |
83 }; | 84 }; |
84 | 85 |
85 } // namespace cc | 86 } // namespace cc |
86 | 87 |
87 #endif // CC_LAYERS_TEXTURE_LAYER_IMPL_H_ | 88 #endif // CC_LAYERS_TEXTURE_LAYER_IMPL_H_ |
OLD | NEW |