CC Animations: Port UI Browser Compositor to use compositor animation timelines.

ui/compositor/layer.h

 // Copyright (c) 2012 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 UI_COMPOSITOR_LAYER_H_
 #define UI_COMPOSITOR_LAYER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
 #include "ui/compositor/layer_animation_delegate.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/transform.h"
 
 class SkCanvas;
 
 namespace cc {
+class AnimationPlayer;
 class ContentLayer;
 class CopyOutputRequest;
 class DelegatedFrameProvider;
 class DelegatedRendererLayer;
 class Layer;
 class NinePatchLayer;
 class ResourceUpdateQueue;
 class SolidColorLayer;
 class SurfaceLayer;
 class TextureLayer;
@@ skipping 364 matching lines @@
   float GetGrayscaleForAnimation() const override;
   SkColor GetColorForAnimation() const override;
   float GetDeviceScaleFactor() const override;
   void AddThreadedAnimation(scoped_ptr<cc::Animation> animation) override;
   void RemoveThreadedAnimation(int animation_id) override;
   LayerAnimatorCollection* GetLayerAnimatorCollection() override;
 
   // Creates a corresponding composited layer for |type_|.
   void CreateCcLayer();
 
+  // Creates LayerAnimationController or AnimationPlayer in cc module.
+  void RegisterForAnimations(Compositor* compositor);
+  void AttachLayer();
+  void DetachLayer();
+  void AttachAnimationPlayer();
+  void DetachAnimationPlayer();
+
   // Recomputes and sets to |cc_layer_|.
   void RecomputeDrawsContentAndUVRect();
   void RecomputePosition();
 
   // Set all filters which got applied to the layer.
   void SetLayerFilters();
 
   // Set all filters which got applied to the layer background.
   void SetLayerBackgroundFilters();
 
@@ skipping 62 matching lines @@
   // Shape of the window.
   scoped_ptr<SkRegion> alpha_shape_;
 
   std::string name_;
 
   LayerDelegate* delegate_;
 
   LayerOwner* owner_;
 
   scoped_refptr<LayerAnimator> animator_;
+  scoped_refptr<cc::AnimationPlayer> animation_player_;
 
   // Animations that are passed to AddThreadedAnimation before this layer is
   // added to a tree.
   cc::ScopedPtrVector<cc::Animation> pending_threaded_animations_;
 
   // Ownership of the layer is held through one of the strongly typed layer
   // pointers, depending on which sort of layer this is.
   scoped_refptr<cc::Layer> content_layer_;
   scoped_refptr<cc::NinePatchLayer> nine_patch_layer_;
   scoped_refptr<cc::TextureLayer> texture_layer_;
@@ skipping 23 matching lines @@
 
   bool inside_paint_;
   gfx::Rect paint_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_