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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 2032213002: cc: Put to_target and to_screen behind an accessor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename ids to node_ids Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 7343b242fad6609a304c34339e574f89fbb757d3..8ea029d1096cfebdc413af16a464c69305187865 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -507,13 +507,17 @@ bool AddTransformNodeIfNeeded(
ShouldFlattenTransform(layer) || has_surface;
DCHECK_GT(data_from_ancestor.property_trees->effect_tree.size(), 0u);
- node->data.target_id = data_for_children->property_trees->effect_tree
- .Node(data_from_ancestor.render_target)
- ->data.transform_id;
- node->data.content_target_id = data_for_children->property_trees->effect_tree
- .Node(data_for_children->render_target)
- ->data.transform_id;
- DCHECK_NE(node->data.target_id, kInvalidPropertyTreeNodeId);
+ data_for_children->property_trees->transform_tree.SetTargetId(
+ node->id, data_for_children->property_trees->effect_tree
+ .Node(data_from_ancestor.render_target)
+ ->data.transform_id);
+ data_for_children->property_trees->transform_tree.SetContentTargetId(
+ node->id, data_for_children->property_trees->effect_tree
+ .Node(data_for_children->render_target)
+ ->data.transform_id);
+ DCHECK_NE(
+ data_for_children->property_trees->transform_tree.TargetId(node->id),
+ kInvalidPropertyTreeNodeId);
node->data.has_potential_animation = has_potentially_animated_transform;
node->data.is_currently_animating = layer->TransformIsAnimating();

Powered by Google App Engine
This is Rietveld 408576698