CC Animation: Make AnimationRegistrar a private member of AnimationHost.

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 59 matching lines @@
   const MutatorHostClient* mutator_host_client() const {
     return mutator_host_client_;
   }
   void SetMutatorHostClient(MutatorHostClient* client);
 
   void SetNeedsCommit();
   void SetNeedsRebuildPropertyTrees();
 
   void PushPropertiesTo(AnimationHost* host_impl);
 
-  AnimationRegistrar* animation_registrar() const {
-    return animation_registrar_.get();
-  }
-
   void SetSupportsScrollAnimations(bool supports_scroll_animations);
   bool SupportsScrollAnimations() const;
   bool NeedsAnimateLayers() const;
 
   bool ActivateAnimations();
   bool AnimateLayers(base::TimeTicks monotonic_time);
   bool UpdateAnimationState(bool start_ready_animations,
                             AnimationEvents* events);
 
   std::unique_ptr<AnimationEvents> CreateEvents();
@@ skipping 50 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);
+
+  void SetAnimationRegistrarFor(
+      scoped_refptr<LayerAnimationController> controller);
+  void ResetAnimationRegistrarFor(
+      scoped_refptr<LayerAnimationController> controller);
+
+  // Registers the given controller as alive.
+  void RegisterAnimationController(LayerAnimationController* controller);
+  // Unregisters the given controller as alive.
+  void UnregisterAnimationController(LayerAnimationController* controller);
+
+  using AnimationControllerMap =
+      std::unordered_map<int, LayerAnimationController*>;
+  const AnimationControllerMap& active_animation_controllers_for_testing()
+      const;
+  const AnimationControllerMap& all_animation_controllers_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);
 
   // TODO(loyso): For now AnimationPlayers share LayerAnimationController object
@@ skipping 15 matching lines @@
   std::unique_ptr<ScrollOffsetAnimations> scroll_offset_animations_;
 
   const ThreadInstance thread_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_HOST_H_