| Index: cc/layers/layer.cc
|
| diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
|
| index 1865815b707fcb16e38f2e47a4fe790a9d884b7e..60afdfb525ce79420c2e9edbffe60c4bb5ed2349 100644
|
| --- a/cc/layers/layer.cc
|
| +++ b/cc/layers/layer.cc
|
| @@ -1715,23 +1715,11 @@ void Layer::OnTransformIsPotentiallyAnimatingChanged(
|
|
|
| node->data.has_potential_animation = has_potential_animation;
|
| if (has_potential_animation) {
|
| - float maximum_target_scale = 0.f;
|
| - node->data.local_maximum_animation_target_scale =
|
| - MaximumTargetScale(&maximum_target_scale) ? maximum_target_scale : 0.f;
|
| -
|
| - float animation_start_scale = 0.f;
|
| - node->data.local_starting_animation_scale =
|
| - AnimationStartScale(&animation_start_scale) ? animation_start_scale
|
| - : 0.f;
|
| -
|
| node->data.has_only_translation_animations = HasOnlyTranslationTransforms();
|
| -
|
| - } else {
|
| - node->data.local_maximum_animation_target_scale = 0.f;
|
| - node->data.local_starting_animation_scale = 0.f;
|
| - node->data.has_only_translation_animations = true;
|
| - }
|
| - property_trees->transform_tree.set_needs_update(true);
|
| + } else {
|
| + node->data.has_only_translation_animations = true;
|
| + }
|
| + property_trees->transform_tree.set_needs_update(true);
|
| }
|
|
|
| void Layer::OnOpacityIsCurrentlyAnimatingChanged(bool is_currently_animating) {
|
|
|