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

Side by Side Diff: Source/core/animation/Animation.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 Animation_h 31 #ifndef Animation_h
32 #define Animation_h 32 #define Animation_h
33 33
34 #include "core/animation/AnimationEffect.h" 34 #include "core/animation/AnimationEffect.h"
35 #include "core/animation/AnimationSource.h"
35 #include "core/animation/EffectInput.h" 36 #include "core/animation/EffectInput.h"
36 #include "core/animation/TimedItem.h"
37 #include "core/animation/TimingInput.h" 37 #include "core/animation/TimingInput.h"
38 #include "platform/heap/Handle.h" 38 #include "platform/heap/Handle.h"
39 #include "wtf/RefPtr.h" 39 #include "wtf/RefPtr.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 class Dictionary; 43 class Dictionary;
44 class Element; 44 class Element;
45 class ExceptionState; 45 class ExceptionState;
46 class SampledEffect; 46 class SampledEffect;
47 47
48 class Animation FINAL : public TimedItem { 48 class Animation FINAL : public AnimationSource {
49 public: 49 public:
50 enum Priority { DefaultPriority, TransitionPriority }; 50 enum Priority { DefaultPriority, TransitionPriority };
51 51
52 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtr<Eve ntDelegate> = nullptr); 52 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtr<Eve ntDelegate> = nullptr);
53 // Web Animations API Bindings constructors. 53 // Web Animations API Bindings constructors.
54 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>, const Dictionary& timingInputDictionary); 54 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>, const Dictionary& timingInputDictionary);
55 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>, double duration); 55 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>, double duration);
56 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>); 56 static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRa wPtr<AnimationEffect>);
57 static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dicti onary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, Excep tionState&); 57 static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dicti onary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, Excep tionState&);
58 static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dicti onary>& keyframeDictionaryVector, double duration, ExceptionState&); 58 static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dicti onary>& keyframeDictionaryVector, double duration, ExceptionState&);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 RefPtrWillBeMember<AnimationEffect> m_effect; 99 RefPtrWillBeMember<AnimationEffect> m_effect;
100 RawPtrWillBeMember<SampledEffect> m_sampledEffect; 100 RawPtrWillBeMember<SampledEffect> m_sampledEffect;
101 101
102 Priority m_priority; 102 Priority m_priority;
103 103
104 Vector<int> m_compositorAnimationIds; 104 Vector<int> m_compositorAnimationIds;
105 105
106 friend class AnimationAnimationV8Test; 106 friend class AnimationAnimationV8Test;
107 }; 107 };
108 108
109 DEFINE_TYPE_CASTS(Animation, TimedItem, timedItem, timedItem->isAnimation(), tim edItem.isAnimation()); 109 DEFINE_TYPE_CASTS(Animation, AnimationSource, animationSource, animationSource-> isAnimation(), animationSource.isAnimation());
110 110
111 } // namespace WebCore 111 } // namespace WebCore
112 112
113 #endif 113 #endif
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/web-animations-api-expected.txt ('k') | Source/core/animation/Animation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698