Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Side by Side Diff: cc/trees/property_tree_builder.cc

Issue 2762043005: cc : Delete target id and content target id from transform nodes (Closed)
Patch Set: blink changes Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/property_tree.cc ('k') | cc/trees/property_tree_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 if (layer == data_from_ancestor.page_scale_layer) 621 if (layer == data_from_ancestor.page_scale_layer)
622 data_for_children->in_subtree_of_page_scale_layer = true; 622 data_for_children->in_subtree_of_page_scale_layer = true;
623 node->in_subtree_of_page_scale_layer = 623 node->in_subtree_of_page_scale_layer =
624 data_for_children->in_subtree_of_page_scale_layer; 624 data_for_children->in_subtree_of_page_scale_layer;
625 625
626 // Surfaces inherently flatten transforms. 626 // Surfaces inherently flatten transforms.
627 data_for_children->should_flatten = 627 data_for_children->should_flatten =
628 ShouldFlattenTransform(layer) || has_surface; 628 ShouldFlattenTransform(layer) || has_surface;
629 DCHECK_GT(data_from_ancestor.property_trees->effect_tree.size(), 0u); 629 DCHECK_GT(data_from_ancestor.property_trees->effect_tree.size(), 0u);
630 630
631 data_for_children->property_trees->transform_tree.SetTargetId(
632 node->id, data_for_children->property_trees->effect_tree
633 .Node(data_from_ancestor.render_target)
634 ->transform_id);
635 data_for_children->property_trees->transform_tree.SetContentTargetId(
636 node->id, data_for_children->property_trees->effect_tree
637 .Node(data_for_children->render_target)
638 ->transform_id);
639 DCHECK_NE(
640 data_for_children->property_trees->transform_tree.TargetId(node->id),
641 TransformTree::kInvalidNodeId);
642
643 node->has_potential_animation = has_potentially_animated_transform; 631 node->has_potential_animation = has_potentially_animated_transform;
644 node->is_currently_animating = TransformIsAnimating(layer); 632 node->is_currently_animating = TransformIsAnimating(layer);
645 if (has_potentially_animated_transform) { 633 if (has_potentially_animated_transform) {
646 node->has_only_translation_animations = 634 node->has_only_translation_animations =
647 HasOnlyTranslationTransforms(layer); 635 HasOnlyTranslationTransforms(layer);
648 } 636 }
649 637
650 float post_local_scale_factor = 1.0f; 638 float post_local_scale_factor = 1.0f;
651 639
652 if (is_page_scale_layer) { 640 if (is_page_scale_layer) {
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
1518 root_layer, page_scale_layer, inner_viewport_scroll_layer, 1506 root_layer, page_scale_layer, inner_viewport_scroll_layer,
1519 outer_viewport_scroll_layer, overscroll_elasticity_layer, 1507 outer_viewport_scroll_layer, overscroll_elasticity_layer,
1520 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 1508 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
1521 device_transform, property_trees, color); 1509 device_transform, property_trees, color);
1522 property_trees->effect_tree.CreateOrReuseRenderSurfaces( 1510 property_trees->effect_tree.CreateOrReuseRenderSurfaces(
1523 &render_surfaces, root_layer->layer_tree_impl()); 1511 &render_surfaces, root_layer->layer_tree_impl());
1524 property_trees->ResetCachedData(); 1512 property_trees->ResetCachedData();
1525 } 1513 }
1526 1514
1527 } // namespace cc 1515 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.cc ('k') | cc/trees/property_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698