| 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 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 if (IsContainerForFixedPositionLayers(layer) || is_fixed) | 562 if (IsContainerForFixedPositionLayers(layer) || is_fixed) |
| 563 data_for_children->scroll_snap = gfx::Vector2dF(); | 563 data_for_children->scroll_snap = gfx::Vector2dF(); |
| 564 | 564 |
| 565 if (!requires_node) { | 565 if (!requires_node) { |
| 566 data_for_children->should_flatten |= ShouldFlattenTransform(layer); | 566 data_for_children->should_flatten |= ShouldFlattenTransform(layer); |
| 567 gfx::Vector2dF local_offset = layer->position().OffsetFromOrigin() + | 567 gfx::Vector2dF local_offset = layer->position().OffsetFromOrigin() + |
| 568 layer->transform().To2dTranslation(); | 568 layer->transform().To2dTranslation(); |
| 569 gfx::Vector2dF source_to_parent; | 569 gfx::Vector2dF source_to_parent; |
| 570 if (source_index != parent_index) { | 570 if (source_index != parent_index) { |
| 571 gfx::Transform to_parent; | 571 gfx::Transform to_parent; |
| 572 data_from_ancestor.property_trees->transform_tree.ComputeTransform( | 572 data_from_ancestor.property_trees->transform_tree.ComputeTranslation( |
| 573 source_index, parent_index, &to_parent); | 573 source_index, parent_index, &to_parent); |
| 574 source_to_parent = to_parent.To2dTranslation(); | 574 source_to_parent = to_parent.To2dTranslation(); |
| 575 } | 575 } |
| 576 layer->set_offset_to_transform_parent(source_offset + source_to_parent + | 576 layer->set_offset_to_transform_parent(source_offset + source_to_parent + |
| 577 local_offset); | 577 local_offset); |
| 578 layer->set_should_flatten_transform_from_property_tree( | 578 layer->set_should_flatten_transform_from_property_tree( |
| 579 data_from_ancestor.should_flatten); | 579 data_from_ancestor.should_flatten); |
| 580 layer->SetTransformTreeIndex(parent_index); | 580 layer->SetTransformTreeIndex(parent_index); |
| 581 return false; | 581 return false; |
| 582 } | 582 } |
| (...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1472 color = SkColorSetA(color, 255); | 1472 color = SkColorSetA(color, 255); |
| 1473 BuildPropertyTreesTopLevelInternal( | 1473 BuildPropertyTreesTopLevelInternal( |
| 1474 root_layer, page_scale_layer, inner_viewport_scroll_layer, | 1474 root_layer, page_scale_layer, inner_viewport_scroll_layer, |
| 1475 outer_viewport_scroll_layer, overscroll_elasticity_layer, | 1475 outer_viewport_scroll_layer, overscroll_elasticity_layer, |
| 1476 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, | 1476 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, |
| 1477 device_transform, property_trees, color); | 1477 device_transform, property_trees, color); |
| 1478 property_trees->ResetCachedData(); | 1478 property_trees->ResetCachedData(); |
| 1479 } | 1479 } |
| 1480 | 1480 |
| 1481 } // namespace cc | 1481 } // namespace cc |
| OLD | NEW |