| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index d50c3a84faac2b98b081304b5548af4e37b3f814..8b51976759e03be20a7ca635d94d4db4f29d9f40 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -1352,13 +1352,26 @@ void LayerTreeHost::SetElementScrollOffsetMutated(
|
| layer->OnScrollOffsetAnimated(scroll_offset);
|
| }
|
|
|
| -void LayerTreeHost::ElementTransformIsPotentiallyAnimatingChanged(
|
| +void LayerTreeHost::ElementTransformIsAnimatingChanged(
|
| ElementId element_id,
|
| ElementListType list_type,
|
| + AnimationChangeType change_type,
|
| bool is_animating) {
|
| Layer* layer = LayerById(element_id);
|
| - DCHECK(layer);
|
| - layer->OnTransformIsPotentiallyAnimatingChanged(is_animating);
|
| + if (layer) {
|
| + switch (change_type) {
|
| + case AnimationChangeType::POTENTIAL:
|
| + layer->OnTransformIsPotentiallyAnimatingChanged(is_animating);
|
| + break;
|
| + case AnimationChangeType::RUNNING:
|
| + layer->OnTransformIsCurrentlyAnimatingChanged(is_animating);
|
| + break;
|
| + case AnimationChangeType::BOTH:
|
| + layer->OnTransformIsPotentiallyAnimatingChanged(is_animating);
|
| + layer->OnTransformIsCurrentlyAnimatingChanged(is_animating);
|
| + break;
|
| + }
|
| + }
|
| }
|
|
|
| void LayerTreeHost::ElementOpacityIsAnimatingChanged(
|
|
|