Index: Source/core/animation/StringKeyframe.h |
diff --git a/Source/core/animation/StringKeyframe.h b/Source/core/animation/StringKeyframe.h |
index a55a501006e22fe96321abd7fefa5e964a0703da..8036de1cb87c82076b0fe3a962c5c06c20685d03 100644 |
--- a/Source/core/animation/StringKeyframe.h |
+++ b/Source/core/animation/StringKeyframe.h |
@@ -26,29 +26,27 @@ public: |
RELEASE_ASSERT(index >= 0); |
return m_propertySet->propertyAt(static_cast<unsigned>(index)).value(); |
} |
- virtual PropertySet properties() const OVERRIDE; |
+ virtual PropertySet properties() const override; |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void trace(Visitor*) override; |
class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe { |
public: |
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*, AnimationEffect::CompositeOperation); |
CSSValue* value() const { return m_value.get(); } |
- virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const OVERRIDE FINAL { |
- return m_animatableValueCache.get(); |
- } |
+ virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const override final { return m_animatableValueCache.get(); } |
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL; |
- virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPropertyID, blink::Keyframe::PropertySpecificKeyframe* end, Element*) const OVERRIDE FINAL; |
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override final; |
+ virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPropertyID, blink::Keyframe::PropertySpecificKeyframe* end, Element*) const override final; |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void trace(Visitor*) override; |
private: |
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*); |
virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const; |
- virtual bool isStringPropertySpecificKeyframe() const OVERRIDE { return true; } |
+ virtual bool isStringPropertySpecificKeyframe() const override { return true; } |
RefPtrWillBeMember<CSSValue> m_value; |
mutable RefPtrWillBeMember<AnimatableValue> m_animatableValueCache; |
@@ -61,10 +59,10 @@ private: |
StringKeyframe(const StringKeyframe& copyFrom); |
- virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const OVERRIDE; |
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE; |
+ virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const override; |
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const override; |
- virtual bool isStringKeyframe() const OVERRIDE { return true; } |
+ virtual bool isStringKeyframe() const override { return true; } |
RefPtrWillBeMember<MutableStylePropertySet> m_propertySet; |
}; |