Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / animation / scroll_offset_animation_curve.h

diff --git a/src/cc/animation/scroll_offset_animation_curve.h b/src/cc/animation/scroll_offset_animation_curve.h
index 3d71e13..0c8692a 100644 (file)
--- a/src/cc/animation/scroll_offset_animation_curve.h
+++ b/src/cc/animation/scroll_offset_animation_curve.h
@@ -9,6 +9,7 @@
 #include "base/time/time.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/base/cc_export.h"
+#include "ui/gfx/geometry/scroll_offset.h"
 
 namespace cc {
 
@@ -17,27 +18,27 @@ class TimingFunction;
 class CC_EXPORT ScrollOffsetAnimationCurve : public AnimationCurve {
  public:
   static scoped_ptr<ScrollOffsetAnimationCurve> Create(
-      const gfx::Vector2dF& target_value,
+      const gfx::ScrollOffset& target_value,
       scoped_ptr<TimingFunction> timing_function);
 
-  virtual ~ScrollOffsetAnimationCurve();
+  ~ScrollOffsetAnimationCurve() override;
 
-  void SetInitialValue(const gfx::Vector2dF& initial_value);
-  gfx::Vector2dF GetValue(double t) const;
-  gfx::Vector2dF target_value() const { return target_value_; }
-  void UpdateTarget(double t, const gfx::Vector2dF& new_target);
+  void SetInitialValue(const gfx::ScrollOffset& initial_value);
+  gfx::ScrollOffset GetValue(double t) const;
+  gfx::ScrollOffset target_value() const { return target_value_; }
+  void UpdateTarget(double t, const gfx::ScrollOffset& new_target);
 
   // AnimationCurve implementation
-  virtual double Duration() const OVERRIDE;
-  virtual CurveType Type() const OVERRIDE;
-  virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
+  double Duration() const override;
+  CurveType Type() const override;
+  scoped_ptr<AnimationCurve> Clone() const override;
 
  private:
-  ScrollOffsetAnimationCurve(const gfx::Vector2dF& target_value,
+  ScrollOffsetAnimationCurve(const gfx::ScrollOffset& target_value,
                              scoped_ptr <TimingFunction> timing_function);
 
-  gfx::Vector2dF initial_value_;
-  gfx::Vector2dF target_value_;
+  gfx::ScrollOffset initial_value_;
+  gfx::ScrollOffset target_value_;
   base::TimeDelta total_animation_duration_;
 
   // Time from animation start to most recent UpdateTarget.