Index: Source/core/animation/InertEffect.cpp |
diff --git a/Source/core/animation/InertEffect.cpp b/Source/core/animation/InertEffect.cpp |
index 7e5deb892795a42a25b9766d816ffc5a3df33266..762c47d4aa3d30a5f2c8339ba5d0a193f5650fd7 100644 |
--- a/Source/core/animation/InertEffect.cpp |
+++ b/Source/core/animation/InertEffect.cpp |
@@ -35,12 +35,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) |
@@ -48,11 +48,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; |
} |