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

Side by Side Diff: Source/core/animation/InertAnimation.h

Issue 129133002: Update animation 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 unified diff | Download patch
« no previous file with comments | « Source/core/animation/DocumentTimeline.h ('k') | Source/core/animation/KeyframeEffectModel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 28 matching lines...) Expand all
39 39
40 class InertAnimation FINAL : public TimedItem { 40 class InertAnimation FINAL : public TimedItem {
41 41
42 public: 42 public:
43 static PassRefPtr<InertAnimation> create(PassRefPtr<AnimationEffect>, const Timing&, bool paused); 43 static PassRefPtr<InertAnimation> create(PassRefPtr<AnimationEffect>, const Timing&, bool paused);
44 PassOwnPtr<AnimationEffect::CompositableValueList> sample(); 44 PassOwnPtr<AnimationEffect::CompositableValueList> sample();
45 AnimationEffect* effect() const { return m_effect.get(); } 45 AnimationEffect* effect() const { return m_effect.get(); }
46 bool paused() const { return m_paused; } 46 bool paused() const { return m_paused; }
47 47
48 protected: 48 protected:
49 virtual bool updateChildrenAndEffects() const OVERRIDE { return false; }; 49 virtual bool updateChildrenAndEffects() const OVERRIDE { return false; }
50 virtual void willDetach() OVERRIDE { }; 50 virtual void willDetach() OVERRIDE { }
51 virtual double calculateTimeToEffectChange(double inheritedTime, double time ToNextIteration) const OVERRIDE FINAL; 51 virtual double calculateTimeToEffectChange(double inheritedTime, double time ToNextIteration) const OVERRIDE;
52 52
53 private: 53 private:
54 InertAnimation(PassRefPtr<AnimationEffect>, const Timing&, bool paused); 54 InertAnimation(PassRefPtr<AnimationEffect>, const Timing&, bool paused);
55 RefPtr<AnimationEffect> m_effect; 55 RefPtr<AnimationEffect> m_effect;
56 bool m_paused; 56 bool m_paused;
57 }; 57 };
58 58
59 } // namespace WebCore 59 } // namespace WebCore
60 60
61 #endif 61 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/DocumentTimeline.h ('k') | Source/core/animation/KeyframeEffectModel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698