Index: Source/core/animation/Animation.h |
diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h |
index 3f8937196673096f8227cd98ddb856eafc8197c5..c05bb19b156b7356887e3f08d6119a57c67b7476 100644 |
--- a/Source/core/animation/Animation.h |
+++ b/Source/core/animation/Animation.h |
@@ -53,11 +53,11 @@ class CORE_EXPORT Animation final : public AnimationNode { |
public: |
enum Priority { DefaultPriority, TransitionPriority }; |
- static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtrWillBeRawPtr<EventDelegate> = nullptr); |
+ static Animation* create(Element*, AnimationEffect*, const Timing&, Priority = DefaultPriority, EventDelegate* = nullptr); |
// Web Animations API Bindings constructors. |
- static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&); |
- static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const AnimationTimingProperties& timingInput, ExceptionState&); |
- static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&); |
+ static Animation* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&); |
+ static Animation* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const AnimationTimingProperties& timingInput, ExceptionState&); |
+ static Animation* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&); |
virtual ~Animation(); |
@@ -66,14 +66,10 @@ public: |
bool affects(PropertyHandle) const; |
const AnimationEffect* effect() const { return m_effect.get(); } |
AnimationEffect* effect() { return m_effect.get(); } |
- void setEffect(PassRefPtrWillBeRawPtr<AnimationEffect> effect) { m_effect = effect; } |
+ void setEffect(AnimationEffect* effect) { m_effect = effect; } |
Priority priority() const { return m_priority; } |
Element* target() const { return m_target; } |
-#if !ENABLE(OILPAN) |
- void notifyElementDestroyed(); |
haraken
2015/05/08 00:13:06
Given that we've not yet shipped oilpan for the No
peria
2015/05/08 02:21:20
Thank you for this notification.
I'll follow insid
|
-#endif |
- |
bool isCandidateForAnimationOnCompositor(double playerPlaybackRate) const; |
// Must only be called once. |
bool maybeStartAnimationOnCompositor(int group, double startTime, double timeOffset, double playerPlaybackRate); |
@@ -103,11 +99,11 @@ protected: |
virtual double calculateTimeToEffectChange(bool forwards, double inheritedTime, double timeToNextIteration) const override; |
private: |
- Animation(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority, PassOwnPtrWillBeRawPtr<EventDelegate>); |
+ Animation(Element*, AnimationEffect*, const Timing&, Priority, EventDelegate*); |
RawPtrWillBeMember<Element> m_target; |
- RefPtrWillBeMember<AnimationEffect> m_effect; |
- RawPtrWillBeMember<SampledEffect> m_sampledEffect; |
+ Member<AnimationEffect> m_effect; |
+ Member<SampledEffect> m_sampledEffect; |
Priority m_priority; |