| Index: Source/core/animation/ElementAnimation.h
|
| diff --git a/Source/core/animation/ElementAnimation.h b/Source/core/animation/ElementAnimation.h
|
| index ee9884e74ad7a283328b779e3be7c7a071d5760e..6a00cfaf1de78dffbbe59e967d181824b852864d 100644
|
| --- a/Source/core/animation/ElementAnimation.h
|
| +++ b/Source/core/animation/ElementAnimation.h
|
| @@ -50,7 +50,7 @@ class ElementAnimation {
|
| public:
|
| static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, double duration, ExceptionState& exceptionState)
|
| {
|
| - RefPtrWillBeRawPtr<EffectModel> effect = EffectInput::convert(&element, effectInput, exceptionState);
|
| + EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
|
| if (exceptionState.hadException())
|
| return 0;
|
| return animateInternal(element, effect, TimingInput::convert(duration));
|
| @@ -58,7 +58,7 @@ public:
|
|
|
| static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, const KeyframeEffectOptions& timingInput, ExceptionState& exceptionState)
|
| {
|
| - RefPtrWillBeRawPtr<EffectModel> effect = EffectInput::convert(&element, effectInput, exceptionState);
|
| + EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
|
| if (exceptionState.hadException())
|
| return 0;
|
| return animateInternal(element, effect, TimingInput::convert(timingInput));
|
| @@ -66,15 +66,15 @@ public:
|
|
|
| static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, ExceptionState& exceptionState)
|
| {
|
| - RefPtrWillBeRawPtr<EffectModel> effect = EffectInput::convert(&element, effectInput, exceptionState);
|
| + EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
|
| if (exceptionState.hadException())
|
| return 0;
|
| return animateInternal(element, effect, Timing());
|
| }
|
|
|
| - static WillBeHeapVector<RefPtrWillBeMember<Animation>> getAnimations(Element& element)
|
| + static HeapVector<Member<Animation>> getAnimations(Element& element)
|
| {
|
| - WillBeHeapVector<RefPtrWillBeMember<Animation>> animationss;
|
| + HeapVector<Member<Animation>> animationss;
|
|
|
| if (!element.hasAnimations())
|
| return animationss;
|
| @@ -88,10 +88,10 @@ public:
|
| }
|
|
|
| private:
|
| - static Animation* animateInternal(Element& element, PassRefPtrWillBeRawPtr<EffectModel> effect, const Timing& timing)
|
| + static Animation* animateInternal(Element& element, EffectModel* effect, const Timing& timing)
|
| {
|
| - RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(&element, effect, timing);
|
| - return element.document().timeline().play(keyframeEffect.get());
|
| + KeyframeEffect* keyframeEffect = KeyframeEffect::create(&element, effect, timing);
|
| + return element.document().timeline().play(keyframeEffect);
|
| }
|
| };
|
|
|
|
|