| Index: Source/core/animation/InertEffect.cpp
|
| diff --git a/Source/core/animation/InertEffect.cpp b/Source/core/animation/InertEffect.cpp
|
| index 1037ed75b7bc7e76f50f7fdbb2a1c474c0dcde0f..e1c678987b744ba9f725f5b4ff09a5009830edc2 100644
|
| --- a/Source/core/animation/InertEffect.cpp
|
| +++ b/Source/core/animation/InertEffect.cpp
|
| @@ -34,12 +34,12 @@
|
|
|
| namespace blink {
|
|
|
| -PassRefPtrWillBeRawPtr<InertEffect> InertEffect::create(PassRefPtrWillBeRawPtr<EffectModel> effect, const Timing& timing, bool paused, double inheritedTime)
|
| +InertEffect* InertEffect::create(EffectModel* effect, const Timing& timing, bool paused, double inheritedTime)
|
| {
|
| - return adoptRefWillBeNoop(new InertEffect(effect, timing, paused, inheritedTime));
|
| + return new InertEffect(effect, timing, paused, inheritedTime);
|
| }
|
|
|
| -InertEffect::InertEffect(PassRefPtrWillBeRawPtr<EffectModel> model, const Timing& timing, bool paused, double inheritedTime)
|
| +InertEffect::InertEffect(EffectModel* model, const Timing& timing, bool paused, double inheritedTime)
|
| : AnimationEffect(timing)
|
| , m_model(model)
|
| , m_paused(paused)
|
| @@ -47,11 +47,12 @@ InertEffect::InertEffect(PassRefPtrWillBeRawPtr<EffectModel> model, const Timing
|
| {
|
| }
|
|
|
| -void InertEffect::sample(OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>& result)
|
| +void InertEffect::sample(HeapVector<Member<Interpolation>>*& result)
|
| {
|
| updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand);
|
| if (!isInEffect()) {
|
| - result.clear();
|
| + if (result)
|
| + result->clear();
|
| return;
|
| }
|
|
|
|
|