CC Animation: Make layer_animation_controller a private member of ElementAnimations.

cc/animation/element_animations.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_ELEMENT_ANIMATIONS_H_
 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_
 
 #include <memory>
 
 #include "base/containers/linked_list.h"
@@ skipping 32 matching lines @@
   ~ElementAnimations() override;
 
   int layer_id() const {
     return layer_animation_controller_ ? layer_animation_controller_->id() : 0;
   }
 
   // Parent AnimationHost.
   AnimationHost* animation_host() { return animation_host_; }
   const AnimationHost* animation_host() const { return animation_host_; }
 
-  LayerAnimationController* layer_animation_controller() const {
-    return layer_animation_controller_.get();
-  }
-
   void CreateLayerAnimationController(int layer_id);
   void DestroyLayerAnimationController();
 
   void LayerRegistered(int layer_id, LayerTreeType tree_type);
   void LayerUnregistered(int layer_id, LayerTreeType tree_type);
 
   bool has_active_value_observer_for_testing() const {
     return !!active_value_observer_;
   }
   bool has_pending_value_observer_for_testing() const {
     return !!pending_value_observer_;
   }
 
   void AddPlayer(AnimationPlayer* player);
   void RemovePlayer(AnimationPlayer* player);
   bool IsEmpty() const;
 
   typedef base::LinkedList<AnimationPlayer> PlayersList;
   typedef base::LinkNode<AnimationPlayer> PlayersListNode;
   const PlayersList& players_list() const { return *players_list_.get(); }
 
   void PushPropertiesTo(ElementAnimations* element_animations_impl);
 
+  void AddAnimation(std::unique_ptr<Animation> animation);
+  void PauseAnimation(int animation_id, base::TimeDelta time_offset);
+  void RemoveAnimation(int animation_id);
+  void AbortAnimation(int animation_id);
+  void AbortAnimations(TargetProperty::Type target_property,
+                       bool needs_completion = false);
+
+  // Returns the active animation animating the given property that is either
+  // running, or is next to run, if such an animation exists.
+  Animation* GetAnimation(TargetProperty::Type target_property) const;
+
+  // Returns the active animation for the given unique animation id.
+  Animation* GetAnimationById(int animation_id) const;
+
+  void AddEventObserver(LayerAnimationEventObserver* observer);
+  void RemoveEventObserver(LayerAnimationEventObserver* observer);
+
  private:
+  // TODO(loyso): Erase this when LAC merged into ElementAnimations.
+  friend class AnimationHost;
+
   explicit ElementAnimations(AnimationHost* host);
 
   void SetFilterMutated(LayerTreeType tree_type,
                         const FilterOperations& filters);
   void SetOpacityMutated(LayerTreeType tree_type, float opacity);
   void SetTransformMutated(LayerTreeType tree_type,
                            const gfx::Transform& transform);
   void SetScrollOffsetMutated(LayerTreeType tree_type,
                               const gfx::ScrollOffset& scroll_offset);
   void SetTransformIsPotentiallyAnimatingChanged(LayerTreeType tree_type,
@@ skipping 32 matching lines @@
   // LAC is owned by ElementAnimations (1:1 relationship).
   scoped_refptr<LayerAnimationController> layer_animation_controller_;
   AnimationHost* animation_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ElementAnimations);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ELEMENT_ANIMATIONS_H_