CC Animations: Rewrite unit tests to work with AnimationPlayer.

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 <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
-#include "cc/animation/animation.h"
-#include "cc/animation/animation_curve.h"
-#include "cc/animation/animation_events.h"
+#include "cc/animation/element_id.h"
 #include "cc/animation/property_animation_state.h"
 #include "cc/animation/target_property.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
 class BoxF;
 }
 
 namespace cc {
 
 class AnimationDelegate;
 class AnimationEvents;
 class AnimationHost;
 class AnimationPlayer;
 class FilterOperations;
-class KeyframeValueList;
 enum class ElementListType;
-enum class AnimationChangeType;
+struct AnimationEvent;
 
 // An ElementAnimations owns a list of all AnimationPlayers, attached to
 // the element.
 // This is a CC counterpart for blink::ElementAnimations (in 1:1 relationship).
 // No pointer to/from respective blink::ElementAnimations object for now.
 class CC_EXPORT ElementAnimations : public base::RefCounted<ElementAnimations> {
  public:
   static scoped_refptr<ElementAnimations> Create();
 
   ElementId element_id() const { return element_id_; }
@@ skipping 16 matching lines @@
 
   typedef base::ObserverList<AnimationPlayer> PlayersList;
   PlayersList& players_list() const { return *players_list_.get(); }
 
   // Ensures that the list of active animations on the main thread and the impl
   // thread are kept in sync. This function does not take ownership of the impl
   // thread ElementAnimations.
   void PushPropertiesTo(
       scoped_refptr<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);
-
   void Animate(base::TimeTicks monotonic_time);
 
   void UpdateState(bool start_ready_animations, AnimationEvents* events);
 
   // Make animations affect active elements if and only if they affect
   // pending elements. Any animations that no longer affect any elements
   // are deleted.
   void ActivateAnimations();
 
-  // 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;
-
   // Returns true if there are any animations that have neither finished nor
   // aborted.
   bool HasActiveAnimation() const;
 
   // Returns true if there are any animations at all to process.
   bool HasAnyAnimation() const;
 
+  bool HasAnyAnimationTargetingProperty(TargetProperty::Type property) const;
+
   // Returns true if there is an animation that is either currently animating
   // the given property or scheduled to animate this property in the future, and
   // that affects the given tree type.
   bool IsPotentiallyAnimatingProperty(TargetProperty::Type target_property,
                                       ElementListType list_type) const;
 
   // Returns true if there is an animation that is currently animating the given
   // property and that affects the given tree type.
   bool IsCurrentlyAnimatingProperty(TargetProperty::Type target_property,
                                     ElementListType list_type) const;
@@ skipping 52 matching lines @@
   // These scroll deltas need to be cleared at activation, so that the active
   // element's scroll offset matches the offset provided by the main thread
   // rather than a combination of this offset and scroll deltas produced by
   // the removed animation. This is to provide the illusion of synchronicity to
   // JS that simultaneously removes an animation and sets the scroll offset.
   bool scroll_offset_animation_was_interrupted() const {
     return scroll_offset_animation_was_interrupted_;
   }
   void SetScrollOffsetAnimationWasInterrupted();
 
-  // TODO(loyso): Erase it, use AnimationPlayer's one.
-  bool needs_to_start_animations_for_testing() const;
-
   void SetNeedsPushProperties();
   bool needs_push_properties() const { return needs_push_properties_; }
 
   void UpdateClientAnimationState();
   void SetNeedsUpdateImplClientState();
 
   void UpdateActivationNormal();
 
   void NotifyClientOpacityAnimated(float opacity,
                                    bool notify_active_elements,
@@ skipping 48 matching lines @@
   PropertyAnimationState pending_state_;
 
   bool needs_update_impl_client_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ElementAnimations);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ELEMENT_ANIMATIONS_H_