Blink Compositor Animation: Introduce CompositorAnimationHost correctly.

third_party/WebKit/Source/platform/animation/CompositorAnimationHost.h

Index: third_party/WebKit/Source/platform/animation/CompositorAnimationHost.h
diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimationHost.h b/third_party/WebKit/Source/platform/animation/CompositorAnimationHost.h
index 5b372a2b8ffc32d3da84019aa9e8f723aa1e5cee..0b71178435f283d5cba86dba12273dc113733f27 100644
--- a/third_party/WebKit/Source/platform/animation/CompositorAnimationHost.h
+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimationHost.h
@@ -5,32 +5,32 @@
 #ifndef CompositorAnimationHost_h
 #define CompositorAnimationHost_h
 
-#include "base/memory/ref_counted.h"
-#include "cc/animation/animation_host.h"
 #include "platform/PlatformExport.h"
+#include "platform/graphics/CompositorElementId.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "wtf/Noncopyable.h"
 
-#include <memory>
+namespace cc {
+class AnimationHost;
+}
 
 namespace blink {
 
+class CompositorAnimationTimeline;
+
 // A compositor representation for cc::AnimationHost.
-// This class wraps cc::AnimationHost and is currently only created from
-// CompositorAnimationTimeline::compositorAnimationHost.
-// TODO(ymalik): Correctly introduce CompositorAnimationHost to blink. See
-// crbug.com/610763.
 class PLATFORM_EXPORT CompositorAnimationHost {
+  WTF_MAKE_NONCOPYABLE(CompositorAnimationHost);
+
  public:
   explicit CompositorAnimationHost(cc::AnimationHost*);
 
-  // TODO(ymalik): Remove when CompositorAnimationHost* optional nullable ptr
-  // is returned. See crbug.com/610763.
-  bool isNull() const;
+  void addTimeline(const CompositorAnimationTimeline&);
+  void removeTimeline(const CompositorAnimationTimeline&);
 
-  void adjustImplOnlyScrollOffsetAnimation(cc::ElementId,
+  void adjustImplOnlyScrollOffsetAnimation(CompositorElementId,
                                            const gfx::Vector2dF& adjustment);
-  void takeOverImplOnlyScrollOffsetAnimation(cc::ElementId);
+  void takeOverImplOnlyScrollOffsetAnimation(CompositorElementId);
 
  private:
   cc::AnimationHost* m_animationHost;