CC Animation: Merge LayerAnimationController into 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/layer_animation_controller.h"
+#include "cc/animation/element_animations.h"
 
 namespace cc {
 
 scoped_refptr<AnimationPlayer> AnimationPlayer::Create(int id) {
   return make_scoped_refptr(new AnimationPlayer(id));
 }
 
 AnimationPlayer::AnimationPlayer(int id)
     : animation_host_(),
       animation_timeline_(),
@@ skipping 52 matching lines @@
     UnregisterPlayer();
 
   layer_id_ = 0;
 }
 
 void AnimationPlayer::RegisterPlayer() {
   DCHECK(layer_id_);
   DCHECK(animation_host_);
   DCHECK(!element_animations_);
 
-  // Create LAC or re-use existing.
+  // Create ElementAnimations or re-use existing.
   animation_host_->RegisterPlayerForLayer(layer_id_, this);
-  // Get local reference to shared LAC.
+  // Get local reference to shared ElementAnimations.
   BindElementAnimations();
 }
 
 void AnimationPlayer::UnregisterPlayer() {
   DCHECK(layer_id_);
   DCHECK(animation_host_);
   DCHECK(element_animations_);
 
   UnbindElementAnimations();
-  // Destroy LAC or release it if it's still needed.
+  // Destroy ElementAnimations or release it if it's still needed.
   animation_host_->UnregisterPlayerForLayer(layer_id_, this);
 }
 
 void AnimationPlayer::BindElementAnimations() {
   DCHECK(!element_animations_);
   element_animations_ =
       animation_host_->GetElementAnimationsForLayerId(layer_id_);
   DCHECK(element_animations_);
 
-  // Pass all accumulated animations to LAC.
+  // Pass all accumulated animations to ElementAnimations.
   for (auto& animation : animations_) {
     element_animations_->AddAnimation(std::move(animation));
   }
   if (!animations_.empty())
     SetNeedsCommit();
   animations_.clear();
 }
 
 void AnimationPlayer::UnbindElementAnimations() {
   element_animations_ = nullptr;
@@ skipping 103 matching lines @@
   }
 }
 
 void AnimationPlayer::SetNeedsCommit() {
   DCHECK(animation_host_);
   animation_host_->SetNeedsCommit();
   animation_host_->SetNeedsRebuildPropertyTrees();
 }
 
 }  // namespace cc