| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_TREES_PROPERTY_TREE_H_ | 5 #ifndef CC_TREES_PROPERTY_TREE_H_ |
| 6 #define CC_TREES_PROPERTY_TREE_H_ | 6 #define CC_TREES_PROPERTY_TREE_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <unordered_map> | 10 #include <unordered_map> |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 | 165 |
| 166 // The maximum scale that this node's |to_target| transform will have during | 166 // The maximum scale that this node's |to_target| transform will have during |
| 167 // current animations, considering only the starting scale of each animation. | 167 // current animations, considering only the starting scale of each animation. |
| 168 float combined_starting_animation_scale; | 168 float combined_starting_animation_scale; |
| 169 | 169 |
| 170 gfx::Vector2dF sublayer_scale; | 170 gfx::Vector2dF sublayer_scale; |
| 171 | 171 |
| 172 // TODO(vollick): will be moved when accelerated effects are implemented. | 172 // TODO(vollick): will be moved when accelerated effects are implemented. |
| 173 gfx::ScrollOffset scroll_offset; | 173 gfx::ScrollOffset scroll_offset; |
| 174 | 174 |
| 175 // We scroll snap where possible, but this has an effect on scroll | 175 // We scroll snap where possible, but this means fixed-pos elements must be |
| 176 // compensation: the snap is yet more scrolling that must be compensated for. | 176 // adjusted. This value stores the snapped amount for this purpose. |
| 177 // This value stores the snapped amount for this purpose. | |
| 178 gfx::Vector2dF scroll_snap; | 177 gfx::Vector2dF scroll_snap; |
| 179 | 178 |
| 180 // TODO(vollick): will be moved when accelerated effects are implemented. | 179 // TODO(vollick): will be moved when accelerated effects are implemented. |
| 181 gfx::Vector2dF source_offset; | 180 gfx::Vector2dF source_offset; |
| 182 gfx::Vector2dF source_to_parent; | 181 gfx::Vector2dF source_to_parent; |
| 183 | 182 |
| 184 bool operator==(const TransformNodeData& other) const; | 183 bool operator==(const TransformNodeData& other) const; |
| 185 | 184 |
| 186 void set_to_parent(const gfx::Transform& transform) { | 185 void set_to_parent(const gfx::Transform& transform) { |
| 187 to_parent = transform; | 186 to_parent = transform; |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 | 651 |
| 653 private: | 652 private: |
| 654 gfx::Vector2dF inner_viewport_container_bounds_delta_; | 653 gfx::Vector2dF inner_viewport_container_bounds_delta_; |
| 655 gfx::Vector2dF outer_viewport_container_bounds_delta_; | 654 gfx::Vector2dF outer_viewport_container_bounds_delta_; |
| 656 gfx::Vector2dF inner_viewport_scroll_bounds_delta_; | 655 gfx::Vector2dF inner_viewport_scroll_bounds_delta_; |
| 657 }; | 656 }; |
| 658 | 657 |
| 659 } // namespace cc | 658 } // namespace cc |
| 660 | 659 |
| 661 #endif // CC_TREES_PROPERTY_TREE_H_ | 660 #endif // CC_TREES_PROPERTY_TREE_H_ |
| OLD | NEW |