CC Animation: Merge LayerAnimationController into ElementAnimations.

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>
 
@@ skipping 10 matching lines @@
 namespace gfx {
 class ScrollOffset;
 }
 
 namespace cc {
 
 class AnimationEvents;
 class AnimationPlayer;
 class AnimationTimeline;
 class ElementAnimations;
-class LayerAnimationController;
 class LayerTreeHost;
 
 enum class ThreadInstance { MAIN, IMPL };
 
 // An AnimationHost contains all the state required to play animations.
 // Specifically, it owns all the AnimationTimelines objects.
 // There is just one AnimationHost for LayerTreeHost on main renderer thread
 // and just one AnimationHost for LayerTreeHostImpl on impl thread.
 // We synchronize them during the commit process in a one-way data flow process
 // (PushPropertiesTo).
 // An AnimationHost talks to its correspondent LayerTreeHost via
 // LayerTreeMutatorsClient interface.
 class CC_EXPORT AnimationHost {
  public:
-  using AnimationControllerMap =
-      std::unordered_map<int, LayerAnimationController*>;
+  using LayerToElementAnimationsMap =
+      std::unordered_map<int, scoped_refptr<ElementAnimations>>;
 
   static std::unique_ptr<AnimationHost> Create(ThreadInstance thread_instance);
   ~AnimationHost();
 
   void AddAnimationTimeline(scoped_refptr<AnimationTimeline> timeline);
   void RemoveAnimationTimeline(scoped_refptr<AnimationTimeline> timeline);
   AnimationTimeline* GetTimelineById(int timeline_id) const;
 
   void ClearTimelines();
 
   void RegisterLayer(int layer_id, LayerTreeType tree_type);
   void UnregisterLayer(int layer_id, LayerTreeType tree_type);
 
   void RegisterPlayerForLayer(int layer_id, AnimationPlayer* player);
   void UnregisterPlayerForLayer(int layer_id, AnimationPlayer* player);
 
   scoped_refptr<ElementAnimations> GetElementAnimationsForLayerId(
       int layer_id) const;
 
-  // TODO(loyso): Get rid of LayerAnimationController.
-  LayerAnimationController* GetControllerForLayerId(int layer_id) const;
-
   // Parent LayerTreeHost or LayerTreeHostImpl.
   MutatorHostClient* mutator_host_client() { return mutator_host_client_; }
   const MutatorHostClient* mutator_host_client() const {
     return mutator_host_client_;
   }
   void SetMutatorHostClient(MutatorHostClient* client);
 
   void SetNeedsCommit();
   void SetNeedsRebuildPropertyTrees();
 
@@ skipping 62 matching lines @@
                                      const gfx::ScrollOffset& target_offset,
                                      const gfx::ScrollOffset& current_offset);
   bool ImplOnlyScrollAnimationUpdateTarget(
       int layer_id,
       const gfx::Vector2dF& scroll_delta,
       const gfx::ScrollOffset& max_scroll_offset,
       base::TimeTicks frame_monotonic_time);
 
   void ScrollAnimationAbort(bool needs_completion);
 
-  // If an animation has been registered for the given id, return it. Otherwise
-  // creates a new one and returns a scoped_refptr to it.
-  scoped_refptr<LayerAnimationController> GetAnimationControllerForId(int id);
+  // 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 controller as active. An active animation
-  // controller is one that has a running animation that needs to be ticked.
-  void DidActivateAnimationController(LayerAnimationController* controller);
+  // 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 controller. When this happens, the
-  // animation controller will no longer be ticked (since it's not active). It
-  // is not an error to call this function with a deactivated controller.
-  void DidDeactivateAnimationController(LayerAnimationController* controller);
+  // Registers the given ElementAnimations as alive.
+  void RegisterElementAnimations(ElementAnimations* element_animations);
+  // Unregisters the given ElementAnimations as alive.
+  void UnregisterElementAnimations(ElementAnimations* element_animations);
 
-  // Registers the given controller as alive.
-  void RegisterAnimationController(LayerAnimationController* controller);
-  // Unregisters the given controller as alive.
-  void UnregisterAnimationController(LayerAnimationController* controller);
+  const LayerToElementAnimationsMap& active_element_animations_for_testing()
+      const;
+  const LayerToElementAnimationsMap& all_element_animations_for_testing() const;
 
-  const AnimationControllerMap& active_animation_controllers_for_testing()
-      const;
-  const AnimationControllerMap& all_animation_controllers_for_testing() const;
+  bool animation_waiting_for_deletion() const {
+    return animation_waiting_for_deletion_;
+  }
+  void OnAnimationWaitingForDeletion();
 
  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);
 
-  // AnimationPlayers share ElementAnimations object if they are attached to the
-  // same element(layer). Note that Element can contain many Layers.
-  using LayerToElementAnimationsMap =
-      std::unordered_map<int, scoped_refptr<ElementAnimations>>;
   LayerToElementAnimationsMap layer_to_element_animations_map_;
+  LayerToElementAnimationsMap active_element_animations_map_;
 
   // A list of all timelines which this host owns.
   using IdToTimelineMap =
       std::unordered_map<int, scoped_refptr<AnimationTimeline>>;
   IdToTimelineMap id_to_timeline_map_;
 
-  AnimationControllerMap active_animation_controllers_;
-  AnimationControllerMap all_animation_controllers_;
-
   MutatorHostClient* mutator_host_client_;
 
   class ScrollOffsetAnimations;
   std::unique_ptr<ScrollOffsetAnimations> scroll_offset_animations_;
 
   const ThreadInstance thread_instance_;
 
   bool supports_scroll_animations_;
+  bool animation_waiting_for_deletion_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_HOST_H_