Chromium Code Reviews| Index: cc/trees/layer_tree_host_impl.cc |
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
| index df9e29bc9415aa07188c3c3b1a16a47ca3049314..36b9f4d49805c88992fde3c0671d209dfde275ae 100644 |
| --- a/cc/trees/layer_tree_host_impl.cc |
| +++ b/cc/trees/layer_tree_host_impl.cc |
| @@ -3926,10 +3926,12 @@ void LayerTreeHostImpl::SetTreeLayerOpacityMutated(ElementId element_id, |
| if (!tree) |
| return; |
| - LayerImpl* layer = tree->LayerByElementId(element_id); |
| - if (layer) |
| - tree->property_trees()->effect_tree.OnOpacityAnimated( |
| - opacity, layer->effect_tree_index(), tree); |
| + const int layer_id = tree->LayerIdByElementId(element_id); |
| + const int effect_id = |
| + tree->property_trees()->effect_id_to_index_map[layer_id]; |
| + if (effect_id != EffectTree::kInvalidNodeId) |
| + tree->property_trees()->effect_tree.OnOpacityAnimated(opacity, effect_id, |
| + tree); |
| } |
| void LayerTreeHostImpl::SetTreeLayerTransformMutated( |
| @@ -3939,9 +3941,15 @@ void LayerTreeHostImpl::SetTreeLayerTransformMutated( |
| if (!tree) |
| return; |
| - LayerImpl* layer = tree->LayerByElementId(element_id); |
| + const int layer_id = tree->LayerIdByElementId(element_id); |
| + const int transform_id = |
| + tree->property_trees()->transform_id_to_index_map[layer_id]; |
| + if (transform_id != TransformTree::kInvalidNodeId) |
| + tree->property_trees()->transform_tree.OnTransformAnimated( |
| + transform, transform_id, tree); |
| + LayerImpl* layer = tree->LayerById(layer_id); |
| if (layer) |
| - layer->OnTransformAnimated(transform); |
| + layer->set_was_ever_ready_since_last_transform_animation(false); |
|
jaydasika
2016/08/23 21:53:01
Will sort out was_ever_ready_since_last_transform_
|
| } |
| void LayerTreeHostImpl::SetTreeLayerScrollOffsetMutated( |