| Index: cc/animation/animation_host.cc
|
| diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc
|
| index 6acf62e98e1b1e238375236b6019a26bc447d483..824f8a69e5bf7061410a22dee116052e25421abc 100644
|
| --- a/cc/animation/animation_host.cc
|
| +++ b/cc/animation/animation_host.cc
|
| @@ -79,7 +79,6 @@ class AnimationHost::ScrollOffsetAnimations : public AnimationDelegate {
|
| DCHECK_EQ(layer_id, scroll_offset_animation_player_->layer_id());
|
|
|
| Animation* animation = scroll_offset_animation_player_->element_animations()
|
| - ->layer_animation_controller()
|
| ->GetAnimation(TargetProperty::SCROLL_OFFSET);
|
| if (!animation) {
|
| scroll_offset_animation_player_->DetachLayer();
|
| @@ -337,7 +336,7 @@ LayerAnimationController* AnimationHost::GetControllerForLayerId(
|
| if (!element_animations)
|
| return nullptr;
|
|
|
| - return element_animations->layer_animation_controller();
|
| + return element_animations->layer_animation_controller_.get();
|
| }
|
|
|
| ElementAnimations* AnimationHost::GetElementAnimationsForLayerId(
|
|
|