CC Animation: Merge LayerAnimationController into ElementAnimations.

cc/animation/animation_player.h

 // 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.
 
 #ifndef CC_ANIMATION_ANIMATION_PLAYER_H_
 #define CC_ANIMATION_ANIMATION_PLAYER_H_
 
 #include <vector>
 
 #include "base/containers/linked_list.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/element_animations.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
 
 class AnimationDelegate;
 class AnimationHost;
 class AnimationTimeline;
 class ElementAnimations;
-class LayerAnimationController;
 enum class LayerTreeType;
 
 // An AnimationPlayer owns all animations to be run on particular CC Layer.
 // Multiple AnimationPlayers can be attached to one layer. In this case,
-// they share common LayerAnimationController (temp solution) so the
-// LayerAnimationController-to-Layer relationship stays the same (1:1, LACs
-// have same IDs as their respective Layers).
+// they share common ElementAnimations so the
+// ElementAnimations-to-Layer relationship is 1:1.
 // For now, the blink logic is responsible for handling of conflicting
 // same-property animations.
 // Each AnimationPlayer has its copy on the impl thread.
 // This is a CC counterpart for blink::AnimationPlayer (in 1:1 relationship).
 class CC_EXPORT AnimationPlayer : public base::RefCounted<AnimationPlayer>,
                                   public base::LinkNode<AnimationPlayer> {
  public:
   static scoped_refptr<AnimationPlayer> Create(int id);
   scoped_refptr<AnimationPlayer> CreateImplInstance() const;
 
@@ skipping 42 matching lines @@
                                TargetProperty::Type target_property,
                                int group);
   void NotifyAnimationAborted(base::TimeTicks monotonic_time,
                               TargetProperty::Type target_property,
                               int group);
   void NotifyAnimationTakeover(base::TimeTicks monotonic_time,
                                TargetProperty::Type target_property,
                                double animation_start_time,
                                std::unique_ptr<AnimationCurve> curve);
 
-  // Whether this player has animations waiting to get sent to LAC.
+  // Whether this player has animations waiting to get sent to ElementAnimations
   bool has_pending_animations_for_testing() const {
     return !animations_.empty();
   }
 
  private:
   friend class base::RefCounted<AnimationPlayer>;
 
   explicit AnimationPlayer(int id);
   ~AnimationPlayer();
 
@@ skipping 18 matching lines @@
 
   int id_;
   int layer_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationPlayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_PLAYER_H_