| Index: Source/core/animation/AnimatableRepeatable.h
|
| diff --git a/Source/core/animation/AnimatableRepeatable.h b/Source/core/animation/AnimatableRepeatable.h
|
| index bd13f3594b2977889f2b817e6ba5634628d8bf63..ebceeee67e0dc6d6f038ee78d053f46dc6b9b149 100644
|
| --- a/Source/core/animation/AnimatableRepeatable.h
|
| +++ b/Source/core/animation/AnimatableRepeatable.h
|
| @@ -43,32 +43,34 @@ public:
|
| virtual ~AnimatableRepeatable() { }
|
|
|
| // This will consume the vector passed into it.
|
| - static PassRefPtr<AnimatableRepeatable> create(Vector<RefPtr<AnimatableValue> >& values)
|
| + static PassRefPtrWillBeRawPtr<AnimatableRepeatable> create(WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> >& values)
|
| {
|
| - return adoptRef(new AnimatableRepeatable(values));
|
| + return adoptRefWillBeNoop(new AnimatableRepeatable(values));
|
| }
|
|
|
| - const Vector<RefPtr<AnimatableValue> >& values() const { return m_values; }
|
| + const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> >& values() const { return m_values; }
|
| +
|
| + virtual void trace(Visitor*) OVERRIDE;
|
|
|
| protected:
|
| AnimatableRepeatable()
|
| {
|
| }
|
| - AnimatableRepeatable(Vector<RefPtr<AnimatableValue> >& values)
|
| + AnimatableRepeatable(WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> >& values)
|
| {
|
| ASSERT(!values.isEmpty());
|
| m_values.swap(values);
|
| }
|
|
|
| - static bool interpolateLists(const Vector<RefPtr<AnimatableValue> >& fromValues, const Vector<RefPtr<AnimatableValue> >& toValues, double fraction, Vector<RefPtr<AnimatableValue> >& interpolatedValues);
|
| + static bool interpolateLists(const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> >& fromValues, const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> >& toValues, double fraction, WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> >& interpolatedValues);
|
|
|
| virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVERRIDE;
|
|
|
| - Vector<RefPtr<AnimatableValue> > m_values;
|
| + WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> > m_values;
|
|
|
| private:
|
| - virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
|
| - virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE FINAL;
|
| + virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
|
| + virtual PassRefPtrWillBeRawPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE FINAL;
|
|
|
| virtual AnimatableType type() const OVERRIDE { return TypeRepeatable; }
|
| virtual bool equalTo(const AnimatableValue*) const OVERRIDE FINAL;
|
|
|