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

Unified Diff: Source/core/animation/InterpolableValue.h

Issue 630993005: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added cpp to list Created 6 years, 2 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 | « Source/core/animation/InertAnimation.h ('k') | Source/core/animation/KeyframeEffectModel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/InterpolableValue.h
diff --git a/Source/core/animation/InterpolableValue.h b/Source/core/animation/InterpolableValue.h
index e775313aee58598b62bd958eceb74219d4fdb9e5..090f0db62ccedff0dded404d95bca61792cf8328 100644
--- a/Source/core/animation/InterpolableValue.h
+++ b/Source/core/animation/InterpolableValue.h
@@ -44,14 +44,14 @@ public:
return adoptPtrWillBeNoop(new InterpolableNumber(value));
}
- virtual bool isNumber() const OVERRIDE FINAL { return true; }
+ virtual bool isNumber() const override final { return true; }
double value() const { return m_value; }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const OVERRIDE FINAL { return create(m_value); }
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); }
- virtual void trace(Visitor* visitor) OVERRIDE { InterpolableValue::trace(visitor); }
+ virtual void trace(Visitor* visitor) override { InterpolableValue::trace(visitor); }
private:
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &to, const double progress) const OVERRIDE FINAL;
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &to, const double progress) const override final;
double m_value;
explicit InterpolableNumber(double value)
@@ -68,14 +68,14 @@ public:
return adoptPtrWillBeNoop(new InterpolableBool(value));
}
- virtual bool isBool() const OVERRIDE FINAL { return true; }
+ virtual bool isBool() const override final { return true; }
bool value() const { return m_value; }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const OVERRIDE FINAL { return create(m_value); }
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); }
- virtual void trace(Visitor* visitor) OVERRIDE { InterpolableValue::trace(visitor); }
+ virtual void trace(Visitor* visitor) override { InterpolableValue::trace(visitor); }
private:
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &to, const double progress) const OVERRIDE FINAL;
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &to, const double progress) const override final;
bool m_value;
explicit InterpolableBool(bool value)
@@ -97,7 +97,7 @@ public:
return adoptPtrWillBeNoop(new InterpolableList(size));
}
- virtual bool isList() const OVERRIDE FINAL { return true; }
+ virtual bool isList() const override final { return true; }
void set(size_t position, PassOwnPtrWillBeRawPtr<InterpolableValue> value)
{
ASSERT(position < m_size);
@@ -109,12 +109,12 @@ public:
return m_values[position].get();
}
size_t length() const { return m_size; }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const OVERRIDE FINAL { return create(*this); }
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(*this); }
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void trace(Visitor*) override;
private:
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &other, const double progress) const OVERRIDE FINAL;
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &other, const double progress) const override final;
explicit InterpolableList(size_t size)
: m_size(size)
, m_values(m_size)
@@ -141,14 +141,14 @@ public:
return adoptPtrWillBeNoop(new InterpolableAnimatableValue(value));
}
- virtual bool isAnimatableValue() const OVERRIDE FINAL { return true; }
+ virtual bool isAnimatableValue() const override final { return true; }
AnimatableValue* value() const { return m_value.get(); }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const OVERRIDE FINAL { return create(m_value); }
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); }
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void trace(Visitor*) override;
private:
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &other, const double progress) const OVERRIDE FINAL;
+ virtual PassOwnPtrWillBeRawPtr<InterpolableValue> interpolate(const InterpolableValue &other, const double progress) const override final;
RefPtrWillBeMember<AnimatableValue> m_value;
InterpolableAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value)
« no previous file with comments | « Source/core/animation/InertAnimation.h ('k') | Source/core/animation/KeyframeEffectModel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698