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

Unified Diff: Source/core/frame/animation/KeyframeAnimation.h

Issue 134043004: Update page & frame classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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/frame/animation/ImplicitAnimation.h ('k') | Source/core/page/Chrome.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/animation/KeyframeAnimation.h
diff --git a/Source/core/frame/animation/KeyframeAnimation.h b/Source/core/frame/animation/KeyframeAnimation.h
index 93334d93c6204affe81a2b211a70b120c1802350..116f8e04397d1696e068b0a47000d01a5bc90b2e 100644
--- a/Source/core/frame/animation/KeyframeAnimation.h
+++ b/Source/core/frame/animation/KeyframeAnimation.h
@@ -39,15 +39,15 @@ class RenderStyle;
// A KeyframeAnimation tracks the state of an explicit animation
// for a single RenderObject.
-class KeyframeAnimation : public AnimationBase {
+class KeyframeAnimation FINAL : public AnimationBase {
public:
static PassRefPtr<KeyframeAnimation> create(const CSSAnimationData* animation, RenderObject& renderer, int index, CompositeAnimation* compositeAnimation, RenderStyle& unanimatedStyle)
{
return adoptRef(new KeyframeAnimation(animation, renderer, index, compositeAnimation, unanimatedStyle));
- };
+ }
- virtual void animate(CompositeAnimation*, RenderObject*, const RenderStyle* currentStyle, RenderStyle* targetStyle, RefPtr<RenderStyle>& animatedStyle);
- virtual void getAnimatedStyle(RefPtr<RenderStyle>& animatedStyle);
+ virtual void animate(CompositeAnimation*, RenderObject*, const RenderStyle* currentStyle, RenderStyle* targetStyle, RefPtr<RenderStyle>& animatedStyle) OVERRIDE;
+ virtual void getAnimatedStyle(RefPtr<RenderStyle>& animatedStyle) OVERRIDE;
const AtomicString& name() const { return m_keyframes.animationName(); }
int index() const { return m_index; }
@@ -58,23 +58,23 @@ public:
void setUnanimatedStyle(PassRefPtr<RenderStyle> style) { m_unanimatedStyle = style; }
RenderStyle* unanimatedStyle() const { return m_unanimatedStyle.get(); }
- virtual double timeToNextService();
+ virtual double timeToNextService() OVERRIDE;
protected:
- virtual void onAnimationStart(double elapsedTime);
- virtual void onAnimationIteration(double elapsedTime);
- virtual void onAnimationEnd(double elapsedTime);
- virtual void startAnimation(double timeOffset);
- virtual void pauseAnimation(double timeOffset);
- virtual void endAnimation();
+ virtual void onAnimationStart(double elapsedTime) OVERRIDE;
+ virtual void onAnimationIteration(double elapsedTime) OVERRIDE;
+ virtual void onAnimationEnd(double elapsedTime) OVERRIDE;
+ virtual void startAnimation(double timeOffset) OVERRIDE;
+ virtual void pauseAnimation(double timeOffset) OVERRIDE;
+ virtual void endAnimation() OVERRIDE;
- virtual void overrideAnimations();
- virtual void resumeOverriddenAnimations();
+ virtual void overrideAnimations() OVERRIDE;
+ virtual void resumeOverriddenAnimations() OVERRIDE;
bool shouldSendEventForListener(Document::ListenerType inListenerType) const;
bool sendAnimationEvent(const AtomicString&, double elapsedTime);
- virtual bool affectsProperty(CSSPropertyID) const;
+ virtual bool affectsProperty(CSSPropertyID) const OVERRIDE;
void validateTransformFunctionList();
void checkForMatchingFilterFunctionLists();
« no previous file with comments | « Source/core/frame/animation/ImplicitAnimation.h ('k') | Source/core/page/Chrome.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698