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

Unified Diff: Source/core/animation/css/CSSAnimations.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/css/CSSAnimationData.h ('k') | Source/core/animation/css/CSSTransitionData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/css/CSSAnimations.h
diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h
index 58bbf1165f5d5d73362ffa08e0b74cda697c48eb..d4104e7d89d1762862a8f11e6e05173aca63b81f 100644
--- a/Source/core/animation/css/CSSAnimations.h
+++ b/Source/core/animation/css/CSSAnimations.h
@@ -52,7 +52,7 @@ class StyleRuleKeyframes;
// This class stores the CSS Animations/Transitions information we use during a style recalc.
// This includes updates to animations/transitions as well as the Interpolations to be applied.
-class CSSAnimationUpdate FINAL : public NoBaseWillBeGarbageCollectedFinalized<CSSAnimationUpdate> {
+class CSSAnimationUpdate final : public NoBaseWillBeGarbageCollectedFinalized<CSSAnimationUpdate> {
public:
void startAnimation(AtomicString& animationName, PassRefPtrWillBeRawPtr<InertAnimation> animation)
{
@@ -161,7 +161,7 @@ private:
WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_activeInterpolationsForTransitions;
};
-class CSSAnimations FINAL {
+class CSSAnimations final {
WTF_MAKE_NONCOPYABLE(CSSAnimations);
DISALLOW_ALLOCATION();
public:
@@ -217,7 +217,7 @@ private:
static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);
static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);
- class AnimationEventDelegate FINAL : public AnimationNode::EventDelegate {
+ class AnimationEventDelegate final : public AnimationNode::EventDelegate {
public:
AnimationEventDelegate(Element* target, const AtomicString& name)
: m_target(target)
@@ -226,8 +226,8 @@ private:
, m_previousIteration(nullValue())
{
}
- virtual void onEventCondition(const AnimationNode*) OVERRIDE;
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void onEventCondition(const AnimationNode*) override;
+ virtual void trace(Visitor*) override;
private:
void maybeDispatch(Document::ListenerType, const AtomicString& eventName, double elapsedTime);
@@ -237,7 +237,7 @@ private:
double m_previousIteration;
};
- class TransitionEventDelegate FINAL : public AnimationNode::EventDelegate {
+ class TransitionEventDelegate final : public AnimationNode::EventDelegate {
public:
TransitionEventDelegate(Element* target, CSSPropertyID property)
: m_target(target)
@@ -245,8 +245,8 @@ private:
, m_previousPhase(AnimationNode::PhaseNone)
{
}
- virtual void onEventCondition(const AnimationNode*) OVERRIDE;
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void onEventCondition(const AnimationNode*) override;
+ virtual void trace(Visitor*) override;
private:
RawPtrWillBeMember<Element> m_target;
« no previous file with comments | « Source/core/animation/css/CSSAnimationData.h ('k') | Source/core/animation/css/CSSTransitionData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698