CC Animation: Make layer_animation_controller a private member of ElementAnimations.

ui/compositor/layer_animator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer_animator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 156 matching lines @@
 
   AttachLayerToAnimationPlayer(delegate_->GetCcLayer()->id());
 
   // Release LAC (it is referenced in ElementAnimations).
   animation_controller_state_ = nullptr;
 }
 
 void LayerAnimator::ResetCompositor(Compositor* compositor) {
   DCHECK(compositor);
 
+  cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
+  DCHECK(timeline);
+
+  const int layer_id = animation_player_->layer_id();
+
   // Store a reference to LAC if any so it may be picked up in SetCompositor.
-  if (animation_player_->element_animations()) {
+  if (layer_id) {
     animation_controller_state_ =
-        animation_player_->element_animations()->layer_animation_controller();
+        timeline->animation_host()->GetControllerForLayerId(layer_id);
   }
 
   DetachLayerFromAnimationPlayer();
 
-  cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
-  DCHECK(timeline);
   timeline->DetachPlayer(animation_player_);
 }
 
 void LayerAnimator::AttachLayerToAnimationPlayer(int layer_id) {
   if (!animation_player_->layer_id())
     animation_player_->AttachLayer(layer_id);
   else
     DCHECK_EQ(animation_player_->layer_id(), layer_id);
 
   if (animation_player_->element_animations()) {
     animation_player_->element_animations()
-        ->layer_animation_controller()
         ->AddEventObserver(this);
   }
 }
 
 void LayerAnimator::DetachLayerFromAnimationPlayer() {
   if (animation_player_->element_animations()) {
     animation_player_->element_animations()
-        ->layer_animation_controller()
         ->RemoveEventObserver(this);
   }
 
   if (animation_player_->layer_id())
     animation_player_->DetachLayer();
 }
 
 void LayerAnimator::AddThreadedAnimation(
     std::unique_ptr<cc::Animation> animation) {
   animation_player_->AddAnimation(std::move(animation));
@@ skipping 746 matching lines @@
     const base::WeakPtr<LayerAnimationSequence>& sequence)
     : sequence_(sequence) {
 }
 
 LayerAnimator::RunningAnimation::RunningAnimation(
     const RunningAnimation& other) = default;
 
 LayerAnimator::RunningAnimation::~RunningAnimation() { }
 
 }  // namespace ui