Index: cc/animation/keyframed_animation_curve.h |
diff --git a/cc/animation/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h |
index 5d25b8928c4ccc6d6660b281d56ef4c3eab01c59..a6e6740e560dd588c7c5cfd260a85e2af4428eef 100644 |
--- a/cc/animation/keyframed_animation_curve.h |
+++ b/cc/animation/keyframed_animation_curve.h |
@@ -37,7 +37,7 @@ class CC_EXPORT ColorKeyframe : public Keyframe { |
double time, |
SkColor value, |
scoped_ptr<TimingFunction> timing_function); |
- virtual ~ColorKeyframe(); |
+ ~ColorKeyframe() override; |
SkColor Value() const; |
@@ -57,7 +57,7 @@ class CC_EXPORT FloatKeyframe : public Keyframe { |
double time, |
float value, |
scoped_ptr<TimingFunction> timing_function); |
- virtual ~FloatKeyframe(); |
+ ~FloatKeyframe() override; |
float Value() const; |
@@ -77,7 +77,7 @@ class CC_EXPORT TransformKeyframe : public Keyframe { |
double time, |
const TransformOperations& value, |
scoped_ptr<TimingFunction> timing_function); |
- virtual ~TransformKeyframe(); |
+ ~TransformKeyframe() override; |
const TransformOperations& Value() const; |
@@ -98,7 +98,7 @@ class CC_EXPORT FilterKeyframe : public Keyframe { |
double time, |
const FilterOperations& value, |
scoped_ptr<TimingFunction> timing_function); |
- virtual ~FilterKeyframe(); |
+ ~FilterKeyframe() override; |
const FilterOperations& Value() const; |
@@ -118,7 +118,7 @@ class CC_EXPORT KeyframedColorAnimationCurve : public ColorAnimationCurve { |
// It is required that the keyframes be sorted by time. |
static scoped_ptr<KeyframedColorAnimationCurve> Create(); |
- virtual ~KeyframedColorAnimationCurve(); |
+ ~KeyframedColorAnimationCurve() override; |
void AddKeyframe(scoped_ptr<ColorKeyframe> keyframe); |
void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
@@ -126,11 +126,11 @@ class CC_EXPORT KeyframedColorAnimationCurve : public ColorAnimationCurve { |
} |
// AnimationCurve implementation |
- virtual double Duration() const override; |
- virtual scoped_ptr<AnimationCurve> Clone() const override; |
+ double Duration() const override; |
+ scoped_ptr<AnimationCurve> Clone() const override; |
// BackgrounColorAnimationCurve implementation |
- virtual SkColor GetValue(double t) const override; |
+ SkColor GetValue(double t) const override; |
private: |
KeyframedColorAnimationCurve(); |
@@ -148,7 +148,7 @@ class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve { |
// It is required that the keyframes be sorted by time. |
static scoped_ptr<KeyframedFloatAnimationCurve> Create(); |
- virtual ~KeyframedFloatAnimationCurve(); |
+ ~KeyframedFloatAnimationCurve() override; |
void AddKeyframe(scoped_ptr<FloatKeyframe> keyframe); |
void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
@@ -156,11 +156,11 @@ class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve { |
} |
// AnimationCurve implementation |
- virtual double Duration() const override; |
- virtual scoped_ptr<AnimationCurve> Clone() const override; |
+ double Duration() const override; |
+ scoped_ptr<AnimationCurve> Clone() const override; |
// FloatAnimationCurve implementation |
- virtual float GetValue(double t) const override; |
+ float GetValue(double t) const override; |
private: |
KeyframedFloatAnimationCurve(); |
@@ -179,7 +179,7 @@ class CC_EXPORT KeyframedTransformAnimationCurve |
// It is required that the keyframes be sorted by time. |
static scoped_ptr<KeyframedTransformAnimationCurve> Create(); |
- virtual ~KeyframedTransformAnimationCurve(); |
+ ~KeyframedTransformAnimationCurve() override; |
void AddKeyframe(scoped_ptr<TransformKeyframe> keyframe); |
void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
@@ -187,17 +187,17 @@ class CC_EXPORT KeyframedTransformAnimationCurve |
} |
// AnimationCurve implementation |
- virtual double Duration() const override; |
- virtual scoped_ptr<AnimationCurve> Clone() const override; |
+ double Duration() const override; |
+ scoped_ptr<AnimationCurve> Clone() const override; |
// TransformAnimationCurve implementation |
- virtual gfx::Transform GetValue(double t) const override; |
- virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, |
- gfx::BoxF* bounds) const override; |
- virtual bool AffectsScale() const override; |
- virtual bool IsTranslation() const override; |
- virtual bool MaximumTargetScale(bool forward_direction, |
- float* max_scale) const override; |
+ gfx::Transform GetValue(double t) const override; |
+ bool AnimatedBoundsForBox(const gfx::BoxF& box, |
+ gfx::BoxF* bounds) const override; |
+ bool AffectsScale() const override; |
+ bool IsTranslation() const override; |
+ bool MaximumTargetScale(bool forward_direction, |
+ float* max_scale) const override; |
private: |
KeyframedTransformAnimationCurve(); |
@@ -216,7 +216,7 @@ class CC_EXPORT KeyframedFilterAnimationCurve |
// It is required that the keyframes be sorted by time. |
static scoped_ptr<KeyframedFilterAnimationCurve> Create(); |
- virtual ~KeyframedFilterAnimationCurve(); |
+ ~KeyframedFilterAnimationCurve() override; |
void AddKeyframe(scoped_ptr<FilterKeyframe> keyframe); |
void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
@@ -224,12 +224,12 @@ class CC_EXPORT KeyframedFilterAnimationCurve |
} |
// AnimationCurve implementation |
- virtual double Duration() const override; |
- virtual scoped_ptr<AnimationCurve> Clone() const override; |
+ double Duration() const override; |
+ scoped_ptr<AnimationCurve> Clone() const override; |
// FilterAnimationCurve implementation |
- virtual FilterOperations GetValue(double t) const override; |
- virtual bool HasFilterThatMovesPixels() const override; |
+ FilterOperations GetValue(double t) const override; |
+ bool HasFilterThatMovesPixels() const override; |
private: |
KeyframedFilterAnimationCurve(); |