Index: Source/core/animation/Animation.h |
diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h |
index ffbbfcc6bc48a7ebeefcedd9b51df10a2395f591..caf5ad971cd8fbf38fdf4f9868676a66d9304fb1 100644 |
--- a/Source/core/animation/Animation.h |
+++ b/Source/core/animation/Animation.h |
@@ -46,18 +46,17 @@ class ExceptionState; |
class SampledEffect; |
class Animation FINAL : public TimedItem { |
- |
public: |
enum Priority { DefaultPriority, TransitionPriority }; |
- static PassRefPtr<Animation> create(PassRefPtr<Element>, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtr<EventDelegate> = nullptr); |
+ static PassRefPtrWillBeRawPtr<Animation> create(PassRefPtr<Element>, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtr<EventDelegate> = nullptr); |
// Web Animations API Bindings constructors. |
- static PassRefPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, const Dictionary& timingInputDictionary); |
- static PassRefPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, double duration); |
- static PassRefPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>); |
- static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState&); |
- static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&); |
- static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&); |
+ static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, const Dictionary& timingInputDictionary); |
+ static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, double duration); |
+ static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>); |
+ static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState&); |
+ static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&); |
+ static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&); |
virtual bool isAnimation() const OVERRIDE { return true; } |
@@ -77,12 +76,14 @@ public: |
void cancelAnimationOnCompositor(); |
void pauseAnimationForTestingOnCompositor(double pauseTime); |
+ virtual void trace(Visitor*); |
+ |
protected: |
void applyEffects(); |
void clearEffects(); |
virtual void updateChildrenAndEffects() const OVERRIDE; |
- virtual void didAttach() OVERRIDE; |
- virtual void willDetach() OVERRIDE; |
+ virtual void attach(AnimationPlayer*) OVERRIDE; |
+ virtual void detach() OVERRIDE; |
virtual void specifiedTimingChanged() OVERRIDE; |
virtual double calculateTimeToEffectChange(bool forwards, double inheritedTime, double timeToNextIteration) const OVERRIDE; |
@@ -90,9 +91,8 @@ private: |
Animation(PassRefPtr<Element>, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority, PassOwnPtr<EventDelegate>); |
RefPtr<Element> m_target; |
- RefPtrWillBePersistent<AnimationEffect> m_effect; |
- |
- SampledEffect* m_sampledEffect; |
+ RefPtrWillBeMember<AnimationEffect> m_effect; |
+ RawPtrWillBeMember<SampledEffect> m_sampledEffect; |
Priority m_priority; |