CC Animation: Make AnimationPlayer to be a unit of activation.

cc/animation/animation_host.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_HOST_H_
 #define CC_ANIMATION_ANIMATION_HOST_H_
 
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_export.h"
 #include "cc/trees/mutator_host.h"
 #include "cc/trees/mutator_host_client.h"
 #include "ui/gfx/geometry/box_f.h"
@@ skipping 22 matching lines @@
 // (PushPropertiesTo).
 // An AnimationHost talks to its correspondent LayerTreeHost via
 // MutatorHostClient interface.
 class CC_ANIMATION_EXPORT AnimationHost
     : public NON_EXPORTED_BASE(MutatorHost) {
  public:
   using ElementToAnimationsMap =
       std::unordered_map<ElementId,
                          scoped_refptr<ElementAnimations>,
                          ElementIdHash>;
+  using PlayersList = std::vector<scoped_refptr<AnimationPlayer>>;
 
   static std::unique_ptr<AnimationHost> CreateMainInstance();
   static std::unique_ptr<AnimationHost> CreateForTesting(
       ThreadInstance thread_instance);
   ~AnimationHost() override;
 
   void AddAnimationTimeline(scoped_refptr<AnimationTimeline> timeline);
   void RemoveAnimationTimeline(scoped_refptr<AnimationTimeline> timeline);
   AnimationTimeline* GetTimelineById(int timeline_id) const;
 
@@ skipping 100 matching lines @@
       const gfx::Vector2dF& scroll_delta,
       const gfx::ScrollOffset& max_scroll_offset,
       base::TimeTicks frame_monotonic_time,
       base::TimeDelta delayed_by) override;
 
   void ScrollAnimationAbort(bool needs_completion) override;
 
   // This should only be called from the main thread.
   ScrollOffsetAnimations& scroll_offset_animations() const;
 
-  // Registers the given element animations as active. An active element
-  // animations is one that has a running animation that needs to be ticked.
-  void DidActivateElementAnimations(ElementAnimations* element_animations);
+  // Registers the given animation player as active. An active animation
+  // player is one that has a running animation that needs to be ticked.
+  void ActivateAnimationPlayer(scoped_refptr<AnimationPlayer> player);
 
-  // Unregisters the given element animations. When this happens, the
-  // element animations will no longer be ticked (since it's not active).
-  void DidDeactivateElementAnimations(ElementAnimations* element_animations);
+  // Unregisters the given animation player. When this happens, the
+  // animation player will no longer be ticked (since it's not active).
+  void DeactivateAnimationPlayer(scoped_refptr<AnimationPlayer> player);
 
-  const ElementToAnimationsMap& active_element_animations_for_testing() const;
+  const PlayersList& active_players_for_testing() const;
   const ElementToAnimationsMap& all_element_animations_for_testing() const;
 
  private:
   explicit AnimationHost(ThreadInstance thread_instance);
 
   void PushTimelinesToImplThread(AnimationHost* host_impl) const;
   void RemoveTimelinesFromImplThread(AnimationHost* host_impl) const;
   void PushPropertiesToImplThread(AnimationHost* host_impl);
 
   void EraseTimeline(scoped_refptr<AnimationTimeline> timeline);
 
   ElementToAnimationsMap element_to_animations_map_;
-  ElementToAnimationsMap active_element_to_animations_map_;
+  PlayersList active_players_;
 
   // A list of all timelines which this host owns.
   using IdToTimelineMap =
       std::unordered_map<int, scoped_refptr<AnimationTimeline>>;
   IdToTimelineMap id_to_timeline_map_;
 
   MutatorHostClient* mutator_host_client_;
 
   std::unique_ptr<ScrollOffsetAnimations> scroll_offset_animations_;
   std::unique_ptr<ScrollOffsetAnimationsImpl> scroll_offset_animations_impl_;
 
   const ThreadInstance thread_instance_;
 
   bool supports_scroll_animations_;
   bool needs_push_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_HOST_H_