| Index: Source/core/animation/animatable/AnimatableRepeatable.h
|
| diff --git a/Source/core/animation/animatable/AnimatableRepeatable.h b/Source/core/animation/animatable/AnimatableRepeatable.h
|
| index 2b144b095a382a62c80d908965e2c4cb34fbbfe4..b66891a818d80d016e967fb1e7d15736cb5cd7a1 100644
|
| --- a/Source/core/animation/animatable/AnimatableRepeatable.h
|
| +++ b/Source/core/animation/animatable/AnimatableRepeatable.h
|
| @@ -44,12 +44,12 @@ public:
|
| virtual ~AnimatableRepeatable() { }
|
|
|
| // This will consume the vector passed into it.
|
| - static PassRefPtrWillBeRawPtr<AnimatableRepeatable> create(WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& values)
|
| + static AnimatableRepeatable* create(HeapVector<Member<AnimatableValue>>& values)
|
| {
|
| - return adoptRefWillBeNoop(new AnimatableRepeatable(values));
|
| + return new AnimatableRepeatable(values);
|
| }
|
|
|
| - const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& values() const { return m_values; }
|
| + const HeapVector<Member<AnimatableValue>>& values() const { return m_values; }
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -57,20 +57,20 @@ protected:
|
| AnimatableRepeatable()
|
| {
|
| }
|
| - AnimatableRepeatable(WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& values)
|
| + AnimatableRepeatable(HeapVector<Member<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 HeapVector<Member<AnimatableValue>>& fromValues, const HeapVector<Member<AnimatableValue>>& toValues, double fraction, HeapVector<Member<AnimatableValue>>& interpolatedValues);
|
|
|
| virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const override;
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> m_values;
|
| + HeapVector<Member<AnimatableValue>> m_values;
|
|
|
| private:
|
| - virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override;
|
| + virtual AnimatableValue* interpolateTo(const AnimatableValue*, double fraction) const override;
|
|
|
| virtual AnimatableType type() const override { return TypeRepeatable; }
|
| virtual bool equalTo(const AnimatableValue*) const override final;
|
|
|