CC Animation: Extract PropertyAnimationState as a non-nested struct.

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 <bitset>
 #include <vector>
 
 #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/animation/element_id.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
 
 class AnimationDelegate;
 class AnimationEvents;
 class AnimationHost;
 class AnimationTimeline;
+struct PropertyAnimationState;
 
 // 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 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> {
@@ skipping 51 matching lines @@
   bool HasActiveAnimation() const;
 
   // Returns true if there are any animations at all to process.
   bool has_any_animation() const { return !animations_.empty(); }
 
   bool needs_push_properties() const { return needs_push_properties_; }
   void SetNeedsPushProperties();
 
   bool HasNonDeletedAnimation() const;
 
-  using Animations = std::vector<std::unique_ptr<Animation>>;
-  const Animations& animations() const { return animations_; }
-
   bool needs_to_start_animations() const { return needs_to_start_animations_; }
 
   void StartAnimations(base::TimeTicks monotonic_time);
   void PromoteStartedAnimations(base::TimeTicks monotonic_time,
                                 AnimationEvents* events);
   void MarkAnimationsForDeletion(base::TimeTicks monotonic_time,
                                  AnimationEvents* events);
   void TickAnimations(base::TimeTicks monotonic_time);
   void MarkFinishedAnimations(base::TimeTicks monotonic_time);
 
@@ skipping 37 matching lines @@
   bool HasElementInActiveList() const;
   gfx::ScrollOffset ScrollOffsetForAnimation() const;
 
   // 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 GetPropertyAnimationStateFor(TargetProperty::Type property,
+                                    PropertyAnimationState* state) const;
+
  private:
   friend class base::RefCounted<AnimationPlayer>;
 
   explicit AnimationPlayer(int id);
   ~AnimationPlayer();
 
   // A set of target properties. TargetProperty must be 0-based enum.
   using TargetProperties =
       std::bitset<TargetProperty::LAST_TARGET_PROPERTY + 1>;
 
   void SetNeedsCommit();
 
   void RegisterPlayer();
   void UnregisterPlayer();
 
   void BindElementAnimations();
   void UnbindElementAnimations();
 
   void AnimationAddedForProperty(TargetProperty::Type target_property);
 
   void MarkAbortedAnimationsForDeletion(
       AnimationPlayer* animation_player_impl) const;
   void PurgeAnimationsMarkedForDeletion();
   void PushNewAnimationsToImplThread(
       AnimationPlayer* animation_player_impl) const;
   void RemoveAnimationsCompletedOnMainThread(
       AnimationPlayer* animation_player_impl) const;
   void PushPropertiesToImplThread(AnimationPlayer* animation_player_impl);
 
+  using Animations = std::vector<std::unique_ptr<Animation>>;
   Animations animations_;
 
   AnimationHost* animation_host_;
   AnimationTimeline* animation_timeline_;
   // element_animations isn't null if player attached to an element (layer).
   scoped_refptr<ElementAnimations> element_animations_;
   AnimationDelegate* animation_delegate_;
 
   int id_;
   ElementId element_id_;
   bool needs_push_properties_;
   base::TimeTicks last_tick_time_;
 
   // Only try to start animations when new animations are added or when the
   // previous attempt at starting animations failed to start all animations.
   bool needs_to_start_animations_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationPlayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_PLAYER_H_