Index: Source/core/animation/Interpolation.h |
diff --git a/Source/core/animation/Interpolation.h b/Source/core/animation/Interpolation.h |
index feaf2ad3029d5e5e6cf308bbbd65482b8e8de0a9..9a53497661fcbb0413aa55ded4cd907c3d22efff 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 GarbageCollectedFinalized<Interpolation> { |
WTF_MAKE_NONCOPYABLE(Interpolation); |
public: |
virtual ~Interpolation(); |
@@ -30,17 +30,17 @@ public: |
DECLARE_VIRTUAL_TRACE(); |
protected: |
- const OwnPtrWillBeMember<InterpolableValue> m_start; |
- const OwnPtrWillBeMember<InterpolableValue> m_end; |
+ const Member<InterpolableValue> m_start; |
+ const Member<InterpolableValue> m_end; |
mutable double m_cachedFraction; |
mutable int m_cachedIteration; |
- mutable OwnPtrWillBeMember<InterpolableValue> m_cachedValue; |
+ mutable Member<InterpolableValue> m_cachedValue; |
- Interpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end); |
+ Interpolation(InterpolableValue* start, InterpolableValue* end); |
private: |
- InterpolableValue* getCachedValueForTesting() const { return m_cachedValue.get(); } |
+ InterpolableValue* getCachedValueForTesting() const { return m_cachedValue; } |
friend class AnimationInterpolableValueTest; |
friend class AnimationInterpolationEffectTest; |