| Index: cc/trees/layer_tree_host_common.cc
|
| diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
|
| index cdb67611826cc66e8cb3af2567c46f5a84729c48..c8f30b02291a6a4f3cd0ef8cdb3c43b971eccf32 100644
|
| --- a/cc/trees/layer_tree_host_common.cc
|
| +++ b/cc/trees/layer_tree_host_common.cc
|
| @@ -1051,8 +1051,7 @@ static inline void CalculateAnimationContentsScale(
|
| // scales and translations. We treat all non-translations as potentially
|
| // affecting scale. Animations that include non-translation/scale components
|
| // will cause the computation of MaximumScale below to fail.
|
| - bool layer_is_animating_scale =
|
| - !layer->layer_animation_controller()->HasOnlyTranslationTransforms();
|
| + bool layer_is_animating_scale = !layer->HasOnlyTranslationTransforms();
|
|
|
| if (!layer_is_animating_scale && !ancestor_is_animating_scale) {
|
| *combined_maximum_animation_contents_scale = 0.f;
|
| @@ -1084,8 +1083,7 @@ static inline void CalculateAnimationContentsScale(
|
| }
|
|
|
| float layer_maximum_animated_scale = 0.f;
|
| - if (!layer->layer_animation_controller()->MaximumTargetScale(
|
| - &layer_maximum_animated_scale)) {
|
| + if (!layer->MaximumTargetScale(&layer_maximum_animated_scale)) {
|
| *combined_maximum_animation_contents_scale = 0.f;
|
| return;
|
| }
|
|
|