Chromium Code Reviews| Index: Source/core/animation/AnimationStack.cpp |
| diff --git a/Source/core/animation/AnimationStack.cpp b/Source/core/animation/AnimationStack.cpp |
| index db53a3704387f481e2b4ef801aff40b357597334..de0217631567782d0a118849099887bbecacc07d 100644 |
| --- a/Source/core/animation/AnimationStack.cpp |
| +++ b/Source/core/animation/AnimationStack.cpp |
| @@ -42,7 +42,7 @@ namespace blink { |
| namespace { |
| -void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<Interpolation>>& source, ActiveInterpolationMap& target) |
| +void copyToActiveInterpolationMap(const Vector<RefPtr<Interpolation>>& source, ActiveInterpolationMap& target) |
| { |
| for (const auto& interpolation : source) { |
| target.set(interpolation->property(), interpolation.get()); |
| @@ -58,7 +58,7 @@ bool compareEffects(const Member<SampledEffect>& effect1, const Member<SampledEf |
| void copyNewAnimationsToActiveInterpolationMap(const HeapVector<Member<InertEffect>>& newAnimations, ActiveInterpolationMap& result) |
| { |
| for (const auto& newAnimation : newAnimations) { |
| - OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> sample = nullptr; |
| + OwnPtr<Vector<RefPtr<Interpolation>>> sample = nullptr; |
|
sof
2015/09/02 13:02:12
(it's fine to leave behind the explicit initializa
|
| newAnimation->sample(sample); |
| if (sample) |
| copyToActiveInterpolationMap(*sample, result); |