| Index: Source/core/animation/InertAnimation.cpp
|
| diff --git a/Source/core/animation/InertAnimation.cpp b/Source/core/animation/InertAnimation.cpp
|
| index 483dd148a278ba31f2dfaf8865e869837212e34c..d22dfd53ef7dcbf5a260d8f41d73c6ab4573bd94 100644
|
| --- a/Source/core/animation/InertAnimation.cpp
|
| +++ b/Source/core/animation/InertAnimation.cpp
|
| @@ -46,16 +46,18 @@ InertAnimation::InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect, c
|
| {
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > InertAnimation::sample(double inheritedTime)
|
| +void InertAnimation::sample(double inheritedTime, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>& result)
|
| {
|
| updateInheritedTime(inheritedTime, TimingUpdateOnDemand);
|
| - if (!isInEffect())
|
| - return nullptr;
|
| + if (!isInEffect()) {
|
| + result.clear();
|
| + return;
|
| + }
|
|
|
| double iteration = currentIteration();
|
| ASSERT(iteration >= 0);
|
| // FIXME: Handle iteration values which overflow int.
|
| - return m_effect->sample(static_cast<int>(iteration), timeFraction(), iterationDuration());
|
| + return m_effect->sample(static_cast<int>(iteration), timeFraction(), iterationDuration(), result);
|
| }
|
|
|
| double InertAnimation::calculateTimeToEffectChange(bool, double, double) const
|
|
|