| 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 <vector> | 10 #include <vector> |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 void FromProtobuf(const proto::TreeNode& proto); | 258 void FromProtobuf(const proto::TreeNode& proto); |
| 259 }; | 259 }; |
| 260 | 260 |
| 261 typedef TreeNode<EffectNodeData> EffectNode; | 261 typedef TreeNode<EffectNodeData> EffectNode; |
| 262 | 262 |
| 263 struct CC_EXPORT ScrollNodeData { | 263 struct CC_EXPORT ScrollNodeData { |
| 264 ScrollNodeData(); | 264 ScrollNodeData(); |
| 265 | 265 |
| 266 bool scrollable; | 266 bool scrollable; |
| 267 bool should_scroll_on_main_thread; | 267 bool should_scroll_on_main_thread; |
| 268 ScrollBlocksOn scroll_blocks_on; | |
| 269 bool contains_non_fast_scrollable_region; | 268 bool contains_non_fast_scrollable_region; |
| 270 | 269 |
| 271 int transform_id; | 270 int transform_id; |
| 272 | 271 |
| 273 bool operator==(const ScrollNodeData& other) const; | 272 bool operator==(const ScrollNodeData& other) const; |
| 274 | 273 |
| 275 void ToProtobuf(proto::TreeNode* proto) const; | 274 void ToProtobuf(proto::TreeNode* proto) const; |
| 276 void FromProtobuf(const proto::TreeNode& proto); | 275 void FromProtobuf(const proto::TreeNode& proto); |
| 277 }; | 276 }; |
| 278 | 277 |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 ClipTree clip_tree; | 535 ClipTree clip_tree; |
| 537 ScrollTree scroll_tree; | 536 ScrollTree scroll_tree; |
| 538 bool needs_rebuild; | 537 bool needs_rebuild; |
| 539 bool non_root_surfaces_enabled; | 538 bool non_root_surfaces_enabled; |
| 540 int sequence_number; | 539 int sequence_number; |
| 541 }; | 540 }; |
| 542 | 541 |
| 543 } // namespace cc | 542 } // namespace cc |
| 544 | 543 |
| 545 #endif // CC_TREES_PROPERTY_TREE_H_ | 544 #endif // CC_TREES_PROPERTY_TREE_H_ |
| OLD | NEW |