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

Unified Diff: Source/core/animation/StringKeyframe.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/LengthStyleInterpolation.h ('k') | Source/core/animation/StyleInterpolation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « Source/core/animation/LengthStyleInterpolation.h ('k') | Source/core/animation/StyleInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698