| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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_LAYER_IMPL_H_ | 5 #ifndef CC_LAYERS_LAYER_IMPL_H_ |
| 6 #define CC_LAYERS_LAYER_IMPL_H_ | 6 #define CC_LAYERS_LAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 LayerImpl* scroll_parent() { return scroll_parent_; } | 144 LayerImpl* scroll_parent() { return scroll_parent_; } |
| 145 const LayerImpl* scroll_parent() const { return scroll_parent_; } | 145 const LayerImpl* scroll_parent() const { return scroll_parent_; } |
| 146 | 146 |
| 147 void SetScrollChildren(std::set<LayerImpl*>* children); | 147 void SetScrollChildren(std::set<LayerImpl*>* children); |
| 148 | 148 |
| 149 std::set<LayerImpl*>* scroll_children() { return scroll_children_.get(); } | 149 std::set<LayerImpl*>* scroll_children() { return scroll_children_.get(); } |
| 150 const std::set<LayerImpl*>* scroll_children() const { | 150 const std::set<LayerImpl*>* scroll_children() const { |
| 151 return scroll_children_.get(); | 151 return scroll_children_.get(); |
| 152 } | 152 } |
| 153 | 153 |
| 154 void set_transform_tree_index(int index) { | 154 void set_property_tree_sequence_number(int sequence_number) {} |
| 155 transform_tree_index_ = index; | 155 |
| 156 SetNeedsPushProperties(); | 156 void SetTransformTreeIndex(int index); |
| 157 } | 157 int transform_tree_index() const { return transform_tree_index_; } |
| 158 void set_clip_tree_index(int index) { | 158 |
| 159 clip_tree_index_ = index; | 159 void SetClipTreeIndex(int index); |
| 160 SetNeedsPushProperties(); | |
| 161 } | |
| 162 void set_opacity_tree_index(int index) { | |
| 163 opacity_tree_index_ = index; | |
| 164 SetNeedsPushProperties(); | |
| 165 } | |
| 166 int clip_tree_index() const { return clip_tree_index_; } | 160 int clip_tree_index() const { return clip_tree_index_; } |
| 167 int transform_tree_index() const { return transform_tree_index_; } | 161 |
| 162 void SetOpacityTreeIndex(int index); |
| 168 int opacity_tree_index() const { return opacity_tree_index_; } | 163 int opacity_tree_index() const { return opacity_tree_index_; } |
| 169 | 164 |
| 170 void set_offset_to_transform_parent(const gfx::Vector2dF& offset) { | 165 void set_offset_to_transform_parent(const gfx::Vector2dF& offset) { |
| 171 offset_to_transform_parent_ = offset; | 166 offset_to_transform_parent_ = offset; |
| 172 SetNeedsPushProperties(); | 167 SetNeedsPushProperties(); |
| 173 } | 168 } |
| 174 gfx::Vector2dF offset_to_transform_parent() const { | 169 gfx::Vector2dF offset_to_transform_parent() const { |
| 175 return offset_to_transform_parent_; | 170 return offset_to_transform_parent_; |
| 176 } | 171 } |
| 177 | 172 |
| (...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 | 825 |
| 831 std::vector<FrameTimingRequest> frame_timing_requests_; | 826 std::vector<FrameTimingRequest> frame_timing_requests_; |
| 832 bool frame_timing_requests_dirty_; | 827 bool frame_timing_requests_dirty_; |
| 833 | 828 |
| 834 DISALLOW_COPY_AND_ASSIGN(LayerImpl); | 829 DISALLOW_COPY_AND_ASSIGN(LayerImpl); |
| 835 }; | 830 }; |
| 836 | 831 |
| 837 } // namespace cc | 832 } // namespace cc |
| 838 | 833 |
| 839 #endif // CC_LAYERS_LAYER_IMPL_H_ | 834 #endif // CC_LAYERS_LAYER_IMPL_H_ |
| OLD | NEW |