| Index: Source/core/animation/KeyframeEffect.h
|
| diff --git a/Source/core/animation/KeyframeEffect.h b/Source/core/animation/KeyframeEffect.h
|
| index f3662588620641730f23ea8db23c36f93f932623..fdc29df5186c564d87e2ceeb247c2db9e2a4c1ba 100644
|
| --- a/Source/core/animation/KeyframeEffect.h
|
| +++ b/Source/core/animation/KeyframeEffect.h
|
| @@ -53,20 +53,20 @@ class CORE_EXPORT KeyframeEffect final : public AnimationEffect {
|
| 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&);
|
|
|
| ~KeyframeEffect() override;
|
|
|
| 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; }
|
| + const EffectModel* model() const { return m_model; }
|
| + EffectModel* model() { return m_model; }
|
| + void setModel(EffectModel* model) { m_model = model; }
|
| Priority priority() const { return m_priority; }
|
| Element* target() const { return m_target; }
|
|
|
| @@ -105,11 +105,11 @@ protected:
|
| bool hasMultipleTransformProperties() const;
|
|
|
| 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;
|
|
|
|
|