| 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 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 | 634 |
| 635 float post_local_scale_factor = 1.0f; | 635 float post_local_scale_factor = 1.0f; |
| 636 | 636 |
| 637 if (is_page_scale_layer) { | 637 if (is_page_scale_layer) { |
| 638 if (!is_root) | 638 if (!is_root) |
| 639 post_local_scale_factor *= data_from_ancestor.page_scale_factor; | 639 post_local_scale_factor *= data_from_ancestor.page_scale_factor; |
| 640 data_for_children->property_trees->transform_tree.set_page_scale_factor( | 640 data_for_children->property_trees->transform_tree.set_page_scale_factor( |
| 641 data_from_ancestor.page_scale_factor); | 641 data_from_ancestor.page_scale_factor); |
| 642 } | 642 } |
| 643 | 643 |
| 644 if (has_surface && !is_root) | |
| 645 node->needs_surface_contents_scale = true; | |
| 646 | |
| 647 node->source_node_id = source_index; | 644 node->source_node_id = source_index; |
| 648 node->post_local_scale_factor = post_local_scale_factor; | 645 node->post_local_scale_factor = post_local_scale_factor; |
| 649 if (is_root) { | 646 if (is_root) { |
| 650 float page_scale_factor_for_root = | 647 float page_scale_factor_for_root = |
| 651 is_page_scale_layer ? data_from_ancestor.page_scale_factor : 1.f; | 648 is_page_scale_layer ? data_from_ancestor.page_scale_factor : 1.f; |
| 652 data_for_children->property_trees->transform_tree | 649 data_for_children->property_trees->transform_tree |
| 653 .SetRootTransformsAndScales(data_for_children->property_trees | 650 .SetRootTransformsAndScales(data_for_children->property_trees |
| 654 ->transform_tree.device_scale_factor(), | 651 ->transform_tree.device_scale_factor(), |
| 655 page_scale_factor_for_root, | 652 page_scale_factor_for_root, |
| 656 *data_from_ancestor.device_transform, | 653 *data_from_ancestor.device_transform, |
| (...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1486 color = SkColorSetA(color, 255); | 1483 color = SkColorSetA(color, 255); |
| 1487 BuildPropertyTreesTopLevelInternal( | 1484 BuildPropertyTreesTopLevelInternal( |
| 1488 root_layer, page_scale_layer, inner_viewport_scroll_layer, | 1485 root_layer, page_scale_layer, inner_viewport_scroll_layer, |
| 1489 outer_viewport_scroll_layer, overscroll_elasticity_layer, | 1486 outer_viewport_scroll_layer, overscroll_elasticity_layer, |
| 1490 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, | 1487 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, |
| 1491 device_transform, property_trees, color); | 1488 device_transform, property_trees, color); |
| 1492 property_trees->ResetCachedData(); | 1489 property_trees->ResetCachedData(); |
| 1493 } | 1490 } |
| 1494 | 1491 |
| 1495 } // namespace cc | 1492 } // namespace cc |
| OLD | NEW |