| Index: Source/core/animation/Interpolation.h
|
| diff --git a/Source/core/animation/Interpolation.h b/Source/core/animation/Interpolation.h
|
| index feaf2ad3029d5e5e6cf308bbbd65482b8e8de0a9..068a1e9f8a477e9a2883996910a05f30a85d6bf7 100644
|
| --- a/Source/core/animation/Interpolation.h
|
| +++ b/Source/core/animation/Interpolation.h
|
| @@ -13,7 +13,7 @@ namespace blink {
|
|
|
| class PropertyHandle;
|
|
|
| -class CORE_EXPORT Interpolation : public RefCountedWillBeGarbageCollectedFinalized<Interpolation> {
|
| +class CORE_EXPORT Interpolation : public RefCounted<Interpolation> {
|
| WTF_MAKE_NONCOPYABLE(Interpolation);
|
| public:
|
| virtual ~Interpolation();
|
| @@ -27,17 +27,15 @@ public:
|
|
|
| virtual PropertyHandle property() const = 0;
|
|
|
| - DECLARE_VIRTUAL_TRACE();
|
| -
|
| protected:
|
| - const OwnPtrWillBeMember<InterpolableValue> m_start;
|
| - const OwnPtrWillBeMember<InterpolableValue> m_end;
|
| + const OwnPtr<InterpolableValue> m_start;
|
| + const OwnPtr<InterpolableValue> m_end;
|
|
|
| mutable double m_cachedFraction;
|
| mutable int m_cachedIteration;
|
| - mutable OwnPtrWillBeMember<InterpolableValue> m_cachedValue;
|
| + mutable OwnPtr<InterpolableValue> m_cachedValue;
|
|
|
| - Interpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end);
|
| + Interpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end);
|
|
|
| private:
|
| InterpolableValue* getCachedValueForTesting() const { return m_cachedValue.get(); }
|
|
|