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

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

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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/IntegerSVGInterpolation.h ('k') | Source/core/animation/InterpolableValueTest.cpp » ('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 0b6040841c1e767dcf6bd76c4de15bbe4947b842..3acc20f0ca5c36401020abc63079ff8da9cf78d1 100644
--- a/Source/core/animation/InterpolableValue.h
+++ b/Source/core/animation/InterpolableValue.h
@@ -51,14 +51,14 @@ public:
return adoptPtrWillBeNoop(new InterpolableNumber(value));
}
- virtual bool isNumber() const override final { return true; }
+ bool isNumber() const final { return true; }
double value() const { return m_value; }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); }
+ PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return create(m_value); }
private:
- virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final;
- virtual void add(const InterpolableValue& rhs, InterpolableValue& result) const override final;
- virtual void multiply(double scalar, InterpolableValue& result) const override final;
+ void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const final;
+ void add(const InterpolableValue& rhs, InterpolableValue& result) const final;
+ void multiply(double scalar, InterpolableValue& result) const final;
double m_value;
explicit InterpolableNumber(double value)
@@ -75,14 +75,14 @@ public:
return adoptPtrWillBeNoop(new InterpolableBool(value));
}
- virtual bool isBool() const override final { return true; }
+ bool isBool() const final { return true; }
bool value() const { return m_value; }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); }
+ PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return create(m_value); }
private:
- virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final;
- virtual void add(const InterpolableValue& rhs, InterpolableValue& result) const override final;
- virtual void multiply(double scalar, InterpolableValue& result) const override final { ASSERT_NOT_REACHED(); }
+ void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const final;
+ void add(const InterpolableValue& rhs, InterpolableValue& result) const final;
+ void multiply(double scalar, InterpolableValue& result) const final { ASSERT_NOT_REACHED(); }
bool m_value;
explicit InterpolableBool(bool value)
@@ -112,7 +112,7 @@ public:
return adoptPtrWillBeNoop(new InterpolableList(size));
}
- virtual bool isList() const override final { return true; }
+ bool isList() const final { return true; }
void set(size_t position, PassOwnPtrWillBeRawPtr<InterpolableValue> value)
{
ASSERT(position < m_size);
@@ -124,14 +124,14 @@ public:
return m_values[position].get();
}
size_t length() const { return m_size; }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(*this); }
+ PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return create(*this); }
DECLARE_VIRTUAL_TRACE();
private:
- virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final;
- virtual void add(const InterpolableValue& rhs, InterpolableValue& result) const override final;
- virtual void multiply(double scalar, InterpolableValue& result) const override final;
+ void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const final;
+ void add(const InterpolableValue& rhs, InterpolableValue& result) const final;
+ void multiply(double scalar, InterpolableValue& result) const final;
explicit InterpolableList(size_t size)
: m_size(size)
, m_values(m_size)
@@ -158,16 +158,16 @@ public:
return adoptPtrWillBeNoop(new InterpolableAnimatableValue(value));
}
- virtual bool isAnimatableValue() const override final { return true; }
+ bool isAnimatableValue() const final { return true; }
AnimatableValue* value() const { return m_value.get(); }
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); }
+ PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return create(m_value); }
DECLARE_VIRTUAL_TRACE();
private:
- virtual void interpolate(const InterpolableValue &to, const double progress, InterpolableValue& result) const override final;
- virtual void add(const InterpolableValue& rhs, InterpolableValue& result) const override final { ASSERT_NOT_REACHED(); }
- virtual void multiply(double scalar, InterpolableValue& result) const override final { ASSERT_NOT_REACHED(); }
+ void interpolate(const InterpolableValue &to, const double progress, InterpolableValue& result) const final;
+ void add(const InterpolableValue& rhs, InterpolableValue& result) const final { ASSERT_NOT_REACHED(); }
+ void multiply(double scalar, InterpolableValue& result) const final { ASSERT_NOT_REACHED(); }
RefPtrWillBeMember<AnimatableValue> m_value;
InterpolableAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value)
« no previous file with comments | « Source/core/animation/IntegerSVGInterpolation.h ('k') | Source/core/animation/InterpolableValueTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698