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

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

Issue 1113173003: Web Animations: Update naming to reflect spec changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No, really. Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/ElementAnimations.cpp ('k') | Source/core/animation/InertAnimation.cpp » ('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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef InertAnimation_h 31 #ifndef InertAnimation_h
32 #define InertAnimation_h 32 #define InertAnimation_h
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "core/animation/AnimationEffect.h" 35 #include "core/animation/AnimationEffect.h"
36 #include "core/animation/AnimationNode.h" 36 #include "core/animation/EffectModel.h"
37 #include "wtf/RefPtr.h" 37 #include "wtf/RefPtr.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class CORE_EXPORT InertAnimation final : public AnimationNode { 41 class CORE_EXPORT InertAnimation final : public AnimationEffect {
42 public: 42 public:
43 static PassRefPtrWillBeRawPtr<InertAnimation> create(PassRefPtrWillBeRawPtr< AnimationEffect>, const Timing&, bool paused, double inheritedTime); 43 static PassRefPtrWillBeRawPtr<InertAnimation> create(PassRefPtrWillBeRawPtr< EffectModel>, const Timing&, bool paused, double inheritedTime);
44 void sample(OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpola tion>>>&); 44 void sample(OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpola tion>>>&);
45 AnimationEffect* effect() const { return m_effect.get(); } 45 EffectModel* effect() const { return m_effect.get(); }
46 bool paused() const { return m_paused; } 46 bool paused() const { return m_paused; }
47 47
48 DECLARE_VIRTUAL_TRACE(); 48 DECLARE_VIRTUAL_TRACE();
49 49
50 protected: 50 protected:
51 virtual void updateChildrenAndEffects() const override { } 51 virtual void updateChildrenAndEffects() const override { }
52 virtual double calculateTimeToEffectChange(bool forwards, double inheritedTi me, double timeToNextIteration) const override; 52 virtual double calculateTimeToEffectChange(bool forwards, double inheritedTi me, double timeToNextIteration) const override;
53 53
54 private: 54 private:
55 InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, bool paused, double inheritedTime); 55 InertAnimation(PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, bool paus ed, double inheritedTime);
56 RefPtrWillBeMember<AnimationEffect> m_effect; 56 RefPtrWillBeMember<EffectModel> m_effect;
57 bool m_paused; 57 bool m_paused;
58 double m_inheritedTime; 58 double m_inheritedTime;
59 }; 59 };
60 60
61 } // namespace blink 61 } // namespace blink
62 62
63 #endif 63 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/ElementAnimations.cpp ('k') | Source/core/animation/InertAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698