| Index: cc/layers/layer_utils.cc
|
| diff --git a/cc/layers/layer_utils.cc b/cc/layers/layer_utils.cc
|
| index 888174a46d31eb3484422055c959e943533ff4b1..42d0e1b1d756e25dafc5636afa8acbc00e45d186 100644
|
| --- a/cc/layers/layer_utils.cc
|
| +++ b/cc/layers/layer_utils.cc
|
| @@ -13,17 +13,15 @@ namespace cc {
|
| namespace {
|
|
|
| bool HasAnimationThatInflatesBounds(const LayerImpl& layer) {
|
| - return layer.layer_animation_controller()->HasAnimationThatInflatesBounds();
|
| + return layer.HasAnimationThatInflatesBounds();
|
| }
|
|
|
| bool HasFilterAnimationThatInflatesBounds(const LayerImpl& layer) {
|
| - return layer.layer_animation_controller()
|
| - ->HasFilterAnimationThatInflatesBounds();
|
| + return layer.HasFilterAnimationThatInflatesBounds();
|
| }
|
|
|
| bool HasTransformAnimationThatInflatesBounds(const LayerImpl& layer) {
|
| - return layer.layer_animation_controller()
|
| - ->HasTransformAnimationThatInflatesBounds();
|
| + return layer.HasTransformAnimationThatInflatesBounds();
|
| }
|
|
|
| inline bool HasAncestorTransformAnimation(const LayerImpl& layer) {
|
| @@ -112,16 +110,14 @@ bool LayerUtils::GetAnimationBounds(const LayerImpl& layer_in, gfx::BoxF* out) {
|
| // Perform the inflation
|
| if (HasFilterAnimationThatInflatesBounds(*layer)) {
|
| gfx::BoxF inflated;
|
| - if (!layer->layer_animation_controller()->FilterAnimationBoundsForBox(
|
| - box, &inflated))
|
| + if (!layer->FilterAnimationBoundsForBox(box, &inflated))
|
| return false;
|
| box = inflated;
|
| }
|
|
|
| if (HasTransformAnimationThatInflatesBounds(*layer)) {
|
| gfx::BoxF inflated;
|
| - if (!layer->layer_animation_controller()->TransformAnimationBoundsForBox(
|
| - box, &inflated))
|
| + if (!layer->TransformAnimationBoundsForBox(box, &inflated))
|
| return false;
|
| box = inflated;
|
| }
|
|
|