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

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

Issue 293893003: Web Animations: Rename TimedItem to AnimationSource (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update expectations. Created 6 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
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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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/animation/AnimationEffect.h" 34 #include "core/animation/AnimationEffect.h"
35 #include "core/animation/TimedItem.h" 35 #include "core/animation/AnimationSource.h"
36 #include "wtf/RefPtr.h" 36 #include "wtf/RefPtr.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 class InertAnimation FINAL : public TimedItem { 40 class InertAnimation FINAL : public AnimationSource {
41 public: 41 public:
42 static PassRefPtrWillBeRawPtr<InertAnimation> create(PassRefPtrWillBeRawPtr< AnimationEffect>, const Timing&, bool paused); 42 static PassRefPtrWillBeRawPtr<InertAnimation> create(PassRefPtrWillBeRawPtr< AnimationEffect>, const Timing&, bool paused);
43 PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > sample(double inheritedTime); 43 PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > sample(double inheritedTime);
44 AnimationEffect* effect() const { return m_effect.get(); } 44 AnimationEffect* effect() const { return m_effect.get(); }
45 bool paused() const { return m_paused; } 45 bool paused() const { return m_paused; }
46 46
47 virtual void trace(Visitor*); 47 virtual void trace(Visitor*);
48 48
49 protected: 49 protected:
50 virtual void updateChildrenAndEffects() const OVERRIDE { } 50 virtual void updateChildrenAndEffects() const OVERRIDE { }
51 virtual double calculateTimeToEffectChange(bool forwards, double inheritedTi me, double timeToNextIteration) const OVERRIDE; 51 virtual double calculateTimeToEffectChange(bool forwards, double inheritedTi me, double timeToNextIteration) const OVERRIDE;
52 52
53 private: 53 private:
54 InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, bool paused); 54 InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, bool paused);
55 RefPtrWillBeMember<AnimationEffect> m_effect; 55 RefPtrWillBeMember<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/AnimationTimelineTest.cpp ('k') | Source/core/animation/InertAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698