CC Animation: Make layer_animation_controller a private member of ElementAnimations.

cc/animation/animation_player.cc

 // Copyright 2015 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 "cc/animation/animation_player.h"
 
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_timeline.h"
 #include "cc/animation/element_animations.h"
@@ skipping 87 matching lines @@
 }
 
 void AnimationPlayer::BindElementAnimations() {
   DCHECK(!element_animations_);
   element_animations_ =
       animation_host_->GetElementAnimationsForLayerId(layer_id_);
   DCHECK(element_animations_);
 
   // Pass all accumulated animations to LAC.
   for (auto& animation : animations_) {
-    element_animations_->layer_animation_controller()->AddAnimation(
-        std::move(animation));
+    element_animations_->AddAnimation(std::move(animation));
   }
   if (!animations_.empty())
     SetNeedsCommit();
   animations_.clear();
 }
 
 void AnimationPlayer::UnbindElementAnimations() {
   element_animations_ = nullptr;
   DCHECK(animations_.empty());
 }
 
 void AnimationPlayer::AddAnimation(std::unique_ptr<Animation> animation) {
   DCHECK(animation->target_property() != TargetProperty::SCROLL_OFFSET ||
          (animation_host_ && animation_host_->SupportsScrollAnimations()));
 
   if (element_animations_) {
-    element_animations_->layer_animation_controller()->AddAnimation(
-        std::move(animation));
+    element_animations_->AddAnimation(std::move(animation));
     SetNeedsCommit();
   } else {
     animations_.push_back(std::move(animation));
   }
 }
 
 void AnimationPlayer::PauseAnimation(int animation_id, double time_offset) {
   DCHECK(element_animations_);
-  element_animations_->layer_animation_controller()->PauseAnimation(
+  element_animations_->PauseAnimation(
       animation_id, base::TimeDelta::FromSecondsD(time_offset));
   SetNeedsCommit();
 }
 
 void AnimationPlayer::RemoveAnimation(int animation_id) {
   if (element_animations_) {
-    element_animations_->layer_animation_controller()->RemoveAnimation(
-        animation_id);
+    element_animations_->RemoveAnimation(animation_id);
     SetNeedsCommit();
   } else {
     auto animations_to_remove = std::remove_if(
         animations_.begin(), animations_.end(),
         [animation_id](const std::unique_ptr<Animation>& animation) {
           return animation->id() == animation_id;
         });
     animations_.erase(animations_to_remove, animations_.end());
   }
 }
 
 void AnimationPlayer::AbortAnimation(int animation_id) {
   DCHECK(element_animations_);
-  element_animations_->layer_animation_controller()->AbortAnimation(
-      animation_id);
+  element_animations_->AbortAnimation(animation_id);
   SetNeedsCommit();
 }
 
 void AnimationPlayer::AbortAnimations(TargetProperty::Type target_property,
                                       bool needs_completion) {
   if (element_animations_) {
-    element_animations_->layer_animation_controller()->AbortAnimations(
-        target_property, needs_completion);
+    element_animations_->AbortAnimations(target_property, needs_completion);
     SetNeedsCommit();
   } else {
     auto animations_to_remove = std::remove_if(
         animations_.begin(), animations_.end(),
         [target_property](const std::unique_ptr<Animation>& animation) {
           return animation->target_property() == target_property;
         });
     animations_.erase(animations_to_remove, animations_.end());
   }
 }
@@ skipping 47 matching lines @@
   }
 }
 
 void AnimationPlayer::SetNeedsCommit() {
   DCHECK(animation_host_);
   animation_host_->SetNeedsCommit();
   animation_host_->SetNeedsRebuildPropertyTrees();
 }
 
 }  // namespace cc