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 #include "cc/trees/property_tree_builder.h" | 5 #include "cc/trees/property_tree_builder.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
691 data_from_ancestor.in_subtree_of_page_scale_layer; | 691 data_from_ancestor.in_subtree_of_page_scale_layer; |
692 } | 692 } |
693 | 693 |
694 node.data.scroll_clip_layer_bounds = clip_bounds; | 694 node.data.scroll_clip_layer_bounds = clip_bounds; |
695 node.data.is_inner_viewport_scroll_layer = | 695 node.data.is_inner_viewport_scroll_layer = |
696 layer == data_from_ancestor.inner_viewport_scroll_layer; | 696 layer == data_from_ancestor.inner_viewport_scroll_layer; |
697 node.data.is_outer_viewport_scroll_layer = | 697 node.data.is_outer_viewport_scroll_layer = |
698 layer == data_from_ancestor.outer_viewport_scroll_layer; | 698 layer == data_from_ancestor.outer_viewport_scroll_layer; |
699 | 699 |
700 node.data.bounds = layer->bounds(); | 700 node.data.bounds = layer->bounds(); |
| 701 node.data.transform_id = |
| 702 data_for_children->transform_tree_parent->transform_tree_index(); |
701 | 703 |
702 data_for_children->scroll_tree_parent = | 704 data_for_children->scroll_tree_parent = |
703 data_for_children->scroll_tree->Insert(node, parent_id); | 705 data_for_children->scroll_tree->Insert(node, parent_id); |
704 data_for_children->main_thread_scrolling_reasons = | 706 data_for_children->main_thread_scrolling_reasons = |
705 node.data.main_thread_scrolling_reasons; | 707 node.data.main_thread_scrolling_reasons; |
706 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria = | 708 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria = |
707 scroll_node_uninheritable_criteria; | 709 scroll_node_uninheritable_criteria; |
708 } | 710 } |
709 | 711 |
710 layer->SetScrollTreeIndex(data_for_children->scroll_tree_parent); | 712 layer->SetScrollTreeIndex(data_for_children->scroll_tree_parent); |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
952 const gfx::Transform& device_transform, | 954 const gfx::Transform& device_transform, |
953 PropertyTrees* property_trees) { | 955 PropertyTrees* property_trees) { |
954 BuildPropertyTreesTopLevelInternal( | 956 BuildPropertyTreesTopLevelInternal( |
955 root_layer, page_scale_layer, inner_viewport_scroll_layer, | 957 root_layer, page_scale_layer, inner_viewport_scroll_layer, |
956 outer_viewport_scroll_layer, overscroll_elasticity_layer, | 958 outer_viewport_scroll_layer, overscroll_elasticity_layer, |
957 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, | 959 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, |
958 device_transform, property_trees); | 960 device_transform, property_trees); |
959 } | 961 } |
960 | 962 |
961 } // namespace cc | 963 } // namespace cc |
OLD | NEW |