| Index: Source/core/animation/KeyframeEffect.h
|
| diff --git a/Source/core/animation/KeyframeEffect.h b/Source/core/animation/KeyframeEffect.h
|
| index 8cb329962e6f640b08aa947bdfbdab1a137f1001..a054004ca090bfba2e030e0782caf0e74dc9352b 100644
|
| --- a/Source/core/animation/KeyframeEffect.h
|
| +++ b/Source/core/animation/KeyframeEffect.h
|
| @@ -50,23 +50,25 @@ class SampledEffect;
|
|
|
| class CORE_EXPORT KeyframeEffect final : public AnimationEffect {
|
| DEFINE_WRAPPERTYPEINFO();
|
| + USING_PRE_FINALIZER(KeyframeEffect, dispose);
|
| public:
|
| enum Priority { DefaultPriority, TransitionPriority };
|
|
|
| - static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, Priority = DefaultPriority, PassOwnPtrWillBeRawPtr<EventDelegate> = nullptr);
|
| + static KeyframeEffect* create(Element*, EffectModel*, const Timing&, Priority = DefaultPriority, EventDelegate* = nullptr);
|
| // Web Animations API Bindings constructors.
|
| - static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&);
|
| - static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const KeyframeEffectOptions& timingInput, ExceptionState&);
|
| - static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&);
|
| + static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&);
|
| + static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const KeyframeEffectOptions& timingInput, ExceptionState&);
|
| + static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&);
|
|
|
| virtual ~KeyframeEffect();
|
| + void dispose();
|
|
|
| virtual bool isAnimation() const override { return true; }
|
|
|
| bool affects(PropertyHandle) const;
|
| const EffectModel* model() const { return m_model.get(); }
|
| EffectModel* model() { return m_model.get(); }
|
| - void setModel(PassRefPtrWillBeRawPtr<EffectModel> model) { m_model = model; }
|
| + void setModel(EffectModel* model) { m_model = model; }
|
| Priority priority() const { return m_priority; }
|
| Element* target() const { return m_target; }
|
|
|
| @@ -103,11 +105,11 @@ protected:
|
| virtual double calculateTimeToEffectChange(bool forwards, double inheritedTime, double timeToNextIteration) const override;
|
|
|
| private:
|
| - KeyframeEffect(Element*, PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, Priority, PassOwnPtrWillBeRawPtr<EventDelegate>);
|
| + KeyframeEffect(Element*, EffectModel*, const Timing&, Priority, EventDelegate*);
|
|
|
| RawPtrWillBeMember<Element> m_target;
|
| - RefPtrWillBeMember<EffectModel> m_model;
|
| - RawPtrWillBeMember<SampledEffect> m_sampledEffect;
|
| + Member<EffectModel> m_model;
|
| + Member<SampledEffect> m_sampledEffect;
|
|
|
| Priority m_priority;
|
|
|
|
|