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

Unified Diff: Source/core/animation/animatable/AnimatableValueKeyframe.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
Index: Source/core/animation/animatable/AnimatableValueKeyframe.h
diff --git a/Source/core/animation/animatable/AnimatableValueKeyframe.h b/Source/core/animation/animatable/AnimatableValueKeyframe.h
index e1533dbea4d7be341a274e70a384009159d3b29a..6421f164e677fd580e56c62efe26b5d5f02567c3 100644
--- a/Source/core/animation/animatable/AnimatableValueKeyframe.h
+++ b/Source/core/animation/animatable/AnimatableValueKeyframe.h
@@ -27,7 +27,7 @@ public:
ASSERT(m_propertyValues.contains(property));
return m_propertyValues.get(property);
}
- virtual PropertyHandleSet properties() const override;
+ PropertyHandleSet properties() const override;
DECLARE_VIRTUAL_TRACE();
@@ -36,18 +36,18 @@ public:
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue*, EffectModel::CompositeOperation);
AnimatableValue* value() const { return m_value.get(); }
- virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const override final { return m_value; }
+ const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const final { return m_value; }
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override final;
- virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const override final;
+ PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final;
+ PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const final;
DECLARE_VIRTUAL_TRACE();
private:
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue>);
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const override;
- virtual bool isAnimatableValuePropertySpecificKeyframe() const override { return true; }
+ PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const override;
+ bool isAnimatableValuePropertySpecificKeyframe() const override { return true; }
RefPtrWillBeMember<AnimatableValue> m_value;
};
@@ -57,10 +57,10 @@ private:
AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom);
- virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const override;
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const override;
+ PassRefPtrWillBeRawPtr<Keyframe> clone() const override;
+ PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const override;
- virtual bool isAnimatableValueKeyframe() const override { return true; }
+ bool isAnimatableValueKeyframe() const override { return true; }
using PropertyValueMap = WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue>>;
PropertyValueMap m_propertyValues;
« no previous file with comments | « Source/core/animation/animatable/AnimatableUnknown.h ('k') | Source/core/animation/animatable/AnimatableVisibility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698