Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 4e6238ac9960364f0edad3913c05e2a834be1917..d3d2dcc122eaba63fa31371ed8e2df036953938a 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -1240,12 +1240,9 @@ void LayerTreeHost::SetElementOpacityMutated(ElementId element_id, |
DCHECK_LE(opacity, 1.f); |
layer->OnOpacityAnimated(opacity); |
- if (property_trees_.IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, |
- layer->id())) { |
- DCHECK_EQ(layer->effect_tree_index(), |
- property_trees_.layer_id_to_effect_node_index[layer->id()]); |
- EffectNode* node = |
- property_trees_.effect_tree.Node(layer->effect_tree_index()); |
+ if (EffectNode* node = |
+ property_trees_.effect_tree.FindNodeFromOwningLayerId(layer->id())) { |
+ DCHECK_EQ(layer->effect_tree_index(), node->id); |
if (node->opacity == opacity) |
return; |
@@ -1264,12 +1261,10 @@ void LayerTreeHost::SetElementTransformMutated( |
DCHECK(layer); |
layer->OnTransformAnimated(transform); |
- if (property_trees_.IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM, |
- layer->id())) { |
- DCHECK_EQ(layer->transform_tree_index(), |
- property_trees_.layer_id_to_transform_node_index[layer->id()]); |
- TransformNode* node = |
- property_trees_.transform_tree.Node(layer->transform_tree_index()); |
+ if (TransformNode* node = |
+ property_trees_.transform_tree.FindNodeFromOwningLayerId( |
+ layer->id())) { |
+ DCHECK_EQ(layer->transform_tree_index(), node->id); |
if (node->local == transform) |
return; |