Chromium Code Reviews| Index: Source/core/animation/Interpolation.h |
| diff --git a/Source/core/animation/Interpolation.h b/Source/core/animation/Interpolation.h |
| index e565da02192101eeae4bd8b366533dd1b98c70d1..01a426f627a8e66a06ce719dcffb54459b64fb5e 100644 |
| --- a/Source/core/animation/Interpolation.h |
| +++ b/Source/core/animation/Interpolation.h |
| @@ -16,7 +16,7 @@ class StyleResolverState; |
| class Interpolation : public RefCountedWillBeGarbageCollectedFinalized<Interpolation> { |
|
Mads Ager (chromium)
2014/03/26 13:28:31
Looks like this hierarchy doesn't need to be final
haraken
2014/03/26 13:42:30
Done.
|
| public: |
| - static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end) |
| + static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end) |
| { |
| return adoptRefWillBeNoop(new Interpolation(start, end)); |
| } |
| @@ -28,17 +28,17 @@ public: |
| virtual ~Interpolation() { } |
| - virtual void trace(Visitor*) { } |
| + virtual void trace(Visitor*); |
| protected: |
| - const OwnPtr<InterpolableValue> m_start; |
| - const OwnPtr<InterpolableValue> m_end; |
| + const OwnPtrWillBeMember<InterpolableValue> m_start; |
| + const OwnPtrWillBeMember<InterpolableValue> m_end; |
| mutable double m_cachedFraction; |
| mutable int m_cachedIteration; |
| - mutable OwnPtr<InterpolableValue> m_cachedValue; |
| + mutable OwnPtrWillBeMember<InterpolableValue> m_cachedValue; |
| - Interpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end); |
| + Interpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end); |
| private: |
| InterpolableValue* getCachedValueForTesting() const { return m_cachedValue.get(); } |
| @@ -67,7 +67,7 @@ public: |
| protected: |
| CSSPropertyID m_id; |
| - StyleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, CSSPropertyID id) |
| + StyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id) |
| : Interpolation(start, end) |
| , m_id(id) |
| { |
| @@ -93,7 +93,7 @@ public: |
| virtual void trace(Visitor*) OVERRIDE; |
| private: |
| - LegacyStyleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, CSSPropertyID id) |
| + LegacyStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id) |
| : StyleInterpolation(start, end, id) |
| { |
| } |