LayerTreeHost::SetAnimationEvents should use AnimationRegistrar

cc/layers/layer.h

 // Copyright 2010 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_LAYERS_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "cc/animation/layer_animation_controller.h"
-#include "cc/animation/layer_animation_event_observer.h"
 #include "cc/animation/layer_animation_value_observer.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "cc/layers/draw_properties.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/layers/render_surface.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace WebKit {
 class WebAnimationDelegate;
 class WebLayerScrollClient;
 }
 
 namespace cc {
 
 class Animation;
 struct AnimationEvent;
 class LayerAnimationDelegate;
+class LayerAnimationEventObserver;
 class LayerImpl;
 class LayerTreeHost;
 class LayerTreeImpl;
 class PriorityCalculator;
 class RenderingStatsInstrumentation;
 class ResourceUpdateQueue;
 class ScrollbarLayer;
 struct AnimationEvent;
 struct RenderingStats;
 
@@ skipping 267 matching lines @@
 
   LayerTreeHost* layer_tree_host() const { return layer_tree_host_; }
 
   // Set the priority of all desired textures in this layer.
   virtual void SetTexturePriorities(const PriorityCalculator& priority_calc) {}
 
   bool AddAnimation(scoped_ptr<Animation> animation);
   void PauseAnimation(int animation_id, double time_offset);
   void RemoveAnimation(int animation_id);
 
+  void TransferAnimationsTo(Layer* layer);
+
   void SuspendAnimations(double monotonic_time);
   void ResumeAnimations(double monotonic_time);
 
   LayerAnimationController* layer_animation_controller() {
     return layer_animation_controller_.get();
   }
-  void SetLayerAnimationController(
+  void SetLayerAnimationControllerForTest(
       scoped_refptr<LayerAnimationController> controller);
-  scoped_refptr<LayerAnimationController> ReleaseLayerAnimationController();
 
   void set_layer_animation_delegate(WebKit::WebAnimationDelegate* delegate) {
-    layer_animation_delegate_ = delegate;
+    layer_animation_controller_->set_layer_animation_delegate(delegate);
   }
 
   bool HasActiveAnimation() const;
 
-  virtual void NotifyAnimationStarted(const AnimationEvent& event,
-                                      double wall_clock_time);
-  virtual void NotifyAnimationFinished(double wall_clock_time);
-  virtual void NotifyAnimationPropertyUpdate(const AnimationEvent& event);
-
   void AddLayerAnimationEventObserver(
       LayerAnimationEventObserver* animation_observer);
   void RemoveLayerAnimationEventObserver(
       LayerAnimationEventObserver* animation_observer);
 
   virtual Region VisibleContentOpaqueRegion() const;
 
   virtual ScrollbarLayer* ToScrollbarLayer();
 
   gfx::Rect LayerRectToContentRect(const gfx::RectF& layer_rect) const;
@@ skipping 66 matching lines @@
   virtual bool IsActive() const OVERRIDE;
 
   LayerList children_;
   Layer* parent_;
 
   // Layer instances have a weak pointer to their LayerTreeHost.
   // This pointer value is nil when a Layer is not in a tree and is
   // updated via SetLayerTreeHost() if a layer moves between trees.
   LayerTreeHost* layer_tree_host_;
 
-  ObserverList<LayerAnimationEventObserver> layer_animation_observers_;
-
   scoped_refptr<LayerAnimationController> layer_animation_controller_;
 
   // Layer properties.
   gfx::Size bounds_;
 
   gfx::Vector2d scroll_offset_;
   gfx::Vector2d max_scroll_offset_;
   bool scrollable_;
   bool should_scroll_on_main_thread_;
   bool have_wheel_event_handlers_;
@@ skipping 25 matching lines @@
   // Replica layer used for reflections.
   scoped_refptr<Layer> replica_layer_;
 
   // Transient properties.
   float raster_scale_;
   bool automatically_compute_raster_scale_;
   bool bounds_contain_page_scale_;
 
   gfx::Transform impl_transform_;
 
-  WebKit::WebAnimationDelegate* layer_animation_delegate_;
   WebKit::WebLayerScrollClient* layer_scroll_client_;
 
   DrawProperties<Layer, RenderSurface> draw_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_