| Index: cc/animation/scroll_offset_animation_curve.h
|
| diff --git a/cc/animation/scroll_offset_animation_curve.h b/cc/animation/scroll_offset_animation_curve.h
|
| index 8f9530a0a13d0743a1bba664846e5a900864a120..7e5c75bf3386366a6ceb55be0d93922cd6f2b8cd 100644
|
| --- a/cc/animation/scroll_offset_animation_curve.h
|
| +++ b/cc/animation/scroll_offset_animation_curve.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_
|
| #define CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "cc/animation/animation_curve.h"
|
| #include "cc/base/cc_export.h"
|
| @@ -19,9 +20,9 @@ class TimingFunction;
|
| class CC_EXPORT ScrollOffsetAnimationCurve : public AnimationCurve {
|
| public:
|
| enum class DurationBehavior { DELTA_BASED, CONSTANT, INVERSE_DELTA };
|
| - static scoped_ptr<ScrollOffsetAnimationCurve> Create(
|
| + static std::unique_ptr<ScrollOffsetAnimationCurve> Create(
|
| const gfx::ScrollOffset& target_value,
|
| - scoped_ptr<TimingFunction> timing_function,
|
| + std::unique_ptr<TimingFunction> timing_function,
|
| DurationBehavior = DurationBehavior::DELTA_BASED);
|
|
|
| ~ScrollOffsetAnimationCurve() override;
|
| @@ -35,13 +36,13 @@ class CC_EXPORT ScrollOffsetAnimationCurve : public AnimationCurve {
|
| // AnimationCurve implementation
|
| base::TimeDelta Duration() const override;
|
| CurveType Type() const override;
|
| - scoped_ptr<AnimationCurve> Clone() const override;
|
| - scoped_ptr<ScrollOffsetAnimationCurve> CloneToScrollOffsetAnimationCurve()
|
| - const;
|
| + std::unique_ptr<AnimationCurve> Clone() const override;
|
| + std::unique_ptr<ScrollOffsetAnimationCurve>
|
| + CloneToScrollOffsetAnimationCurve() const;
|
|
|
| private:
|
| ScrollOffsetAnimationCurve(const gfx::ScrollOffset& target_value,
|
| - scoped_ptr<TimingFunction> timing_function,
|
| + std::unique_ptr<TimingFunction> timing_function,
|
| DurationBehavior);
|
|
|
| gfx::ScrollOffset initial_value_;
|
| @@ -51,7 +52,7 @@ class CC_EXPORT ScrollOffsetAnimationCurve : public AnimationCurve {
|
| // Time from animation start to most recent UpdateTarget.
|
| base::TimeDelta last_retarget_;
|
|
|
| - scoped_ptr<TimingFunction> timing_function_;
|
| + std::unique_ptr<TimingFunction> timing_function_;
|
| DurationBehavior duration_behavior_;
|
|
|
| bool has_set_initial_value_;
|
|
|