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

Unified Diff: Source/core/animation/PrimitiveInterpolation.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/PathSVGInterpolation.h ('k') | Source/core/animation/RectSVGInterpolation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/PrimitiveInterpolation.h
diff --git a/Source/core/animation/PrimitiveInterpolation.h b/Source/core/animation/PrimitiveInterpolation.h
index a452f1e3299c7accce4ad855b43e18b92c4d16e8..8ae0d755ac3d5cde75d892f3c04ece8d28880dc7 100644
--- a/Source/core/animation/PrimitiveInterpolation.h
+++ b/Source/core/animation/PrimitiveInterpolation.h
@@ -28,7 +28,7 @@ public:
// Represents a pair of keyframes that are compatible for "smooth" interpolation eg. "0px" and "100px".
class PairwisePrimitiveInterpolation : public PrimitiveInterpolation {
public:
- virtual ~PairwisePrimitiveInterpolation() { }
+ ~PairwisePrimitiveInterpolation() override { }
static PassOwnPtrWillBeRawPtr<PairwisePrimitiveInterpolation> create(const InterpolationType& type, PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, PassRefPtrWillBeRawPtr<NonInterpolableValue> nonInterpolableValue)
{
@@ -56,7 +56,7 @@ private:
, m_nonInterpolableValue(nonInterpolableValue)
{ }
- virtual void interpolate(double fraction, OwnPtrWillBeMember<InterpolationValue>& result) const override final
+ void interpolate(double fraction, OwnPtrWillBeMember<InterpolationValue>& result) const final
{
ASSERT(result);
ASSERT(&result->type() == &m_type);
@@ -73,7 +73,7 @@ private:
// Represents a pair of incompatible keyframes that fall back to 50% flip behaviour eg. "auto" and "0px".
class FlipPrimitiveInterpolation : public PrimitiveInterpolation {
public:
- virtual ~FlipPrimitiveInterpolation() { }
+ ~FlipPrimitiveInterpolation() override { }
static PassOwnPtrWillBeRawPtr<FlipPrimitiveInterpolation> create(PassOwnPtrWillBeRawPtr<InterpolationValue> start, PassOwnPtrWillBeRawPtr<InterpolationValue> end)
{
@@ -97,7 +97,7 @@ private:
ASSERT(m_end);
}
- virtual void interpolate(double fraction, OwnPtrWillBeMember<InterpolationValue>& result) const override final
+ void interpolate(double fraction, OwnPtrWillBeMember<InterpolationValue>& result) const final
{
// TODO(alancutter): Remove this optimisation once Oilpan is default.
if (!std::isnan(m_lastFraction) && (fraction < 0.5) == (m_lastFraction < 0.5))
« no previous file with comments | « Source/core/animation/PathSVGInterpolation.h ('k') | Source/core/animation/RectSVGInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698