Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3026)

Unified Diff: cc/animation/scroll_offset_animation_curve.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/animation/scroll_offset_animation_curve.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/animation/scroll_offset_animation_curve.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698