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

Side by Side Diff: Source/core/animation/AnimationTimeline.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // AnimationPlayers which will be updated on the next frame 108 // AnimationPlayers which will be updated on the next frame
109 // i.e. current, in effect, or had timing changed 109 // i.e. current, in effect, or had timing changed
110 WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> > m_playersNeedingUpda te; 110 WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> > m_playersNeedingUpda te;
111 WillBeHeapHashSet<RawPtrWillBeWeakMember<AnimationPlayer> > m_players; 111 WillBeHeapHashSet<RawPtrWillBeWeakMember<AnimationPlayer> > m_players;
112 112
113 friend class SMILTimeContainer; 113 friend class SMILTimeContainer;
114 static const double s_minimumDelay; 114 static const double s_minimumDelay;
115 115
116 OwnPtrWillBeMember<PlatformTiming> m_timing; 116 OwnPtrWillBeMember<PlatformTiming> m_timing;
117 117
118 class AnimationTimelineTiming FINAL : public PlatformTiming { 118 class AnimationTimelineTiming final : public PlatformTiming {
119 public: 119 public:
120 AnimationTimelineTiming(AnimationTimeline* timeline) 120 AnimationTimelineTiming(AnimationTimeline* timeline)
121 : m_timeline(timeline) 121 : m_timeline(timeline)
122 , m_timer(this, &AnimationTimelineTiming::timerFired) 122 , m_timer(this, &AnimationTimelineTiming::timerFired)
123 { 123 {
124 ASSERT(m_timeline); 124 ASSERT(m_timeline);
125 } 125 }
126 126
127 virtual void wakeAfter(double duration) OVERRIDE; 127 virtual void wakeAfter(double duration) override;
128 virtual void cancelWake() OVERRIDE; 128 virtual void cancelWake() override;
129 virtual void serviceOnNextFrame() OVERRIDE; 129 virtual void serviceOnNextFrame() override;
130 130
131 void timerFired(Timer<AnimationTimelineTiming>*) { m_timeline->wake(); } 131 void timerFired(Timer<AnimationTimelineTiming>*) { m_timeline->wake(); }
132 132
133 virtual void trace(Visitor*) OVERRIDE; 133 virtual void trace(Visitor*) override;
134 134
135 private: 135 private:
136 RawPtrWillBeMember<AnimationTimeline> m_timeline; 136 RawPtrWillBeMember<AnimationTimeline> m_timeline;
137 Timer<AnimationTimelineTiming> m_timer; 137 Timer<AnimationTimelineTiming> m_timer;
138 }; 138 };
139 139
140 friend class AnimationAnimationTimelineTest; 140 friend class AnimationAnimationTimelineTest;
141 }; 141 };
142 142
143 } // namespace blink 143 } // namespace blink
144 144
145 #endif 145 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationPlayer.h ('k') | Source/core/animation/CompositorAnimationsTestHelper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698