| Index: Source/core/animation/animatable/AnimatableRepeatable.h
|
| diff --git a/Source/core/animation/animatable/AnimatableRepeatable.h b/Source/core/animation/animatable/AnimatableRepeatable.h
|
| index 86957f0b56372ae05048b01b27e676ccdf8dadc2..24563e4ed37ccd47080a41f6009dd1ecd3a484ae 100644
|
| --- a/Source/core/animation/animatable/AnimatableRepeatable.h
|
| +++ b/Source/core/animation/animatable/AnimatableRepeatable.h
|
| @@ -44,33 +44,31 @@ public:
|
| ~AnimatableRepeatable() override { }
|
|
|
| // This will consume the vector passed into it.
|
| - static PassRefPtrWillBeRawPtr<AnimatableRepeatable> create(WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& values)
|
| + static PassRefPtr<AnimatableRepeatable> create(Vector<RefPtr<AnimatableValue>>& values)
|
| {
|
| - return adoptRefWillBeNoop(new AnimatableRepeatable(values));
|
| + return adoptRef(new AnimatableRepeatable(values));
|
| }
|
|
|
| - const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& values() const { return m_values; }
|
| -
|
| - DECLARE_VIRTUAL_TRACE();
|
| + const Vector<RefPtr<AnimatableValue>>& values() const { return m_values; }
|
|
|
| protected:
|
| AnimatableRepeatable()
|
| {
|
| }
|
| - AnimatableRepeatable(WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& values)
|
| + AnimatableRepeatable(Vector<RefPtr<AnimatableValue>>& values)
|
| {
|
| ASSERT(!values.isEmpty());
|
| m_values.swap(values);
|
| }
|
|
|
| - static bool interpolateLists(const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& fromValues, const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& toValues, double fraction, WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& interpolatedValues);
|
| + static bool interpolateLists(const Vector<RefPtr<AnimatableValue>>& fromValues, const Vector<RefPtr<AnimatableValue>>& toValues, double fraction, Vector<RefPtr<AnimatableValue>>& interpolatedValues);
|
|
|
| bool usesDefaultInterpolationWith(const AnimatableValue*) const override;
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> m_values;
|
| + Vector<RefPtr<AnimatableValue>> m_values;
|
|
|
| private:
|
| - PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override;
|
| + PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override;
|
|
|
| AnimatableType type() const override { return TypeRepeatable; }
|
| bool equalTo(const AnimatableValue*) const final;
|
|
|