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

Unified Diff: cc/layers/layer_impl.cc

Issue 2616353003: Clarify property tree id-to-index map names. (Closed)
Patch Set: Sync to head. Created 3 years, 11 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
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/render_surface_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 466dd336fda28acbc439ee96046929ee49228f47..4074061f723013ce0ad1ad8dfa7046dffc54ff04 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -505,8 +505,8 @@ void LayerImpl::UpdatePropertyTreeTransformIsAnimated(bool is_animated) {
if (property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
id())) {
TransformTree& transform_tree = GetTransformTree();
- TransformNode* node =
- transform_tree.Node(property_trees->transform_id_to_index_map[id()]);
+ TransformNode* node = transform_tree.Node(
+ property_trees->layer_id_to_transform_node_index[id()]);
// A LayerImpl's own current state is insufficient for determining whether
// it owns a TransformNode, since this depends on the state of the
// corresponding Layer at the time of the last commit. For example, if
@@ -553,13 +553,13 @@ void LayerImpl::OnIsAnimatingChanged(const PropertyAnimationState& mask,
if (property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
id())) {
transform_node = GetTransformTree().Node(
- property_trees->transform_id_to_index_map[id()]);
+ property_trees->layer_id_to_transform_node_index[id()]);
}
EffectNode* effect_node = nullptr;
if (property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id())) {
- effect_node =
- GetEffectTree().Node(property_trees->effect_id_to_index_map[id()]);
+ effect_node = GetEffectTree().Node(
+ property_trees->layer_id_to_effect_node_index[id()]);
}
for (int property = TargetProperty::FIRST_TARGET_PROPERTY;
@@ -721,7 +721,7 @@ float LayerImpl::Opacity() const {
if (!property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id()))
return 1.f;
EffectNode* node =
- GetEffectTree().Node(property_trees->effect_id_to_index_map[id()]);
+ GetEffectTree().Node(property_trees->layer_id_to_effect_node_index[id()]);
return node->opacity;
}
@@ -729,8 +729,8 @@ const gfx::Transform& LayerImpl::Transform() const {
PropertyTrees* property_trees = GetPropertyTrees();
DCHECK(property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
id()));
- TransformNode* node =
- GetTransformTree().Node(property_trees->transform_id_to_index_map[id()]);
+ TransformNode* node = GetTransformTree().Node(
+ property_trees->layer_id_to_transform_node_index[id()]);
return node->local;
}
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/render_surface_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698