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 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1042 layer == data_from_ancestor.outer_viewport_scroll_layer; | 1042 layer == data_from_ancestor.outer_viewport_scroll_layer; |
1043 | 1043 |
1044 node.bounds = layer->bounds(); | 1044 node.bounds = layer->bounds(); |
1045 node.offset_to_transform_parent = layer->offset_to_transform_parent(); | 1045 node.offset_to_transform_parent = layer->offset_to_transform_parent(); |
1046 node.should_flatten = layer->should_flatten_transform_from_property_tree(); | 1046 node.should_flatten = layer->should_flatten_transform_from_property_tree(); |
1047 node.user_scrollable_horizontal = layer->user_scrollable_horizontal(); | 1047 node.user_scrollable_horizontal = layer->user_scrollable_horizontal(); |
1048 node.user_scrollable_vertical = layer->user_scrollable_vertical(); | 1048 node.user_scrollable_vertical = layer->user_scrollable_vertical(); |
1049 node.element_id = layer->element_id(); | 1049 node.element_id = layer->element_id(); |
1050 node.transform_id = | 1050 node.transform_id = |
1051 data_for_children->transform_tree_parent->transform_tree_index(); | 1051 data_for_children->transform_tree_parent->transform_tree_index(); |
| 1052 node.scroll_boundary_behavior = layer->scroll_boundary_behavior(); |
1052 | 1053 |
1053 node_id = | 1054 node_id = |
1054 data_for_children->property_trees->scroll_tree.Insert(node, parent_id); | 1055 data_for_children->property_trees->scroll_tree.Insert(node, parent_id); |
1055 data_for_children->scroll_tree_parent = node_id; | 1056 data_for_children->scroll_tree_parent = node_id; |
1056 data_for_children->main_thread_scrolling_reasons = | 1057 data_for_children->main_thread_scrolling_reasons = |
1057 node.main_thread_scrolling_reasons; | 1058 node.main_thread_scrolling_reasons; |
1058 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria = | 1059 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria = |
1059 scroll_node_uninheritable_criteria; | 1060 scroll_node_uninheritable_criteria; |
1060 data_for_children->property_trees->scroll_tree.SetOwningLayerIdForNode( | 1061 data_for_children->property_trees->scroll_tree.SetOwningLayerIdForNode( |
1061 data_for_children->property_trees->scroll_tree.back(), layer->id()); | 1062 data_for_children->property_trees->scroll_tree.back(), layer->id()); |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1378 root_layer, page_scale_layer, inner_viewport_scroll_layer, | 1379 root_layer, page_scale_layer, inner_viewport_scroll_layer, |
1379 outer_viewport_scroll_layer, overscroll_elasticity_layer, | 1380 outer_viewport_scroll_layer, overscroll_elasticity_layer, |
1380 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, | 1381 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, |
1381 device_transform, property_trees, color); | 1382 device_transform, property_trees, color); |
1382 property_trees->effect_tree.CreateOrReuseRenderSurfaces( | 1383 property_trees->effect_tree.CreateOrReuseRenderSurfaces( |
1383 &render_surfaces, root_layer->layer_tree_impl()); | 1384 &render_surfaces, root_layer->layer_tree_impl()); |
1384 property_trees->ResetCachedData(); | 1385 property_trees->ResetCachedData(); |
1385 } | 1386 } |
1386 | 1387 |
1387 } // namespace cc | 1388 } // namespace cc |
OLD | NEW |