Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / renderer / compositor_bindings / web_animation_impl.h

diff --git a/src/content/renderer/compositor_bindings/web_animation_impl.h b/src/content/renderer/compositor_bindings/web_animation_impl.h
index a706358..460b6f5 100644 (file)
--- a/src/content/renderer/compositor_bindings/web_animation_impl.h
+++ b/src/content/renderer/compositor_bindings/web_animation_impl.h
@@ -7,32 +7,34 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
-#include "third_party/WebKit/public/platform/WebAnimation.h"
+#include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
+#include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h"
 
 namespace cc {
 class Animation;
 }
 
-namespace blink {
-class WebAnimationCurve;
-}
-
 namespace content {
 
-class WebAnimationImpl : public blink::WebAnimation {
+class WebCompositorAnimationImpl : public blink::WebCompositorAnimation {
  public:
-  CONTENT_EXPORT WebAnimationImpl(
-      const blink::WebAnimationCurve& curve,
+  CONTENT_EXPORT WebCompositorAnimationImpl(
+      const blink::WebCompositorAnimationCurve& curve,
       TargetProperty target,
       int animation_id,
       int group_id);
-  virtual ~WebAnimationImpl();
+  virtual ~WebCompositorAnimationImpl();
 
-  // blink::WebAnimation implementation
+  // blink::WebCompositorAnimation implementation
   virtual int id();
   virtual TargetProperty targetProperty() const;
+#if WEB_ANIMATION_SUPPORTS_FRACTIONAL_ITERATIONS
+  virtual double iterations() const;
+  virtual void setIterations(double iterations);
+#else
   virtual int iterations() const;
   virtual void setIterations(int iterations);
+#endif
   virtual double startTime() const;
   virtual void setStartTime(double monotonic_time);
   virtual double timeOffset() const;
@@ -50,7 +52,7 @@ class WebAnimationImpl : public blink::WebAnimation {
  private:
   scoped_ptr<cc::Animation> animation_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl);
+  DISALLOW_COPY_AND_ASSIGN(WebCompositorAnimationImpl);
 };
 
 }  // namespace content