| Index: Source/core/animation/AnimatableLengthSize.h
|
| diff --git a/Source/core/animation/AnimatableLengthSize.h b/Source/core/animation/AnimatableLengthSize.h
|
| index 4e2c8d9090592b9a3b1378525477ba6057297d30..ee0eba86997544eb47b5ecab2eb4104e54243829 100644
|
| --- a/Source/core/animation/AnimatableLengthSize.h
|
| +++ b/Source/core/animation/AnimatableLengthSize.h
|
| @@ -38,19 +38,21 @@ namespace WebCore {
|
| class AnimatableLengthSize FINAL : public AnimatableValue {
|
| public:
|
| virtual ~AnimatableLengthSize() { }
|
| - static PassRefPtr<AnimatableLengthSize> create(PassRefPtr<AnimatableValue> width, PassRefPtr<AnimatableValue> height)
|
| + static PassRefPtrWillBeRawPtr<AnimatableLengthSize> create(PassRefPtrWillBeRawPtr<AnimatableValue> width, PassRefPtrWillBeRawPtr<AnimatableValue> height)
|
| {
|
| - return adoptRef(new AnimatableLengthSize(width, height));
|
| + return adoptRefWillBeNoop(new AnimatableLengthSize(width, height));
|
| }
|
| const AnimatableValue* width() const { return m_width.get(); }
|
| const AnimatableValue* height() const { return m_height.get(); }
|
|
|
| + virtual void trace(Visitor*) OVERRIDE;
|
| +
|
| protected:
|
| - virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
|
| - virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
|
| + virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
|
| + virtual PassRefPtrWillBeRawPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
|
|
|
| private:
|
| - AnimatableLengthSize(PassRefPtr<AnimatableValue> width, PassRefPtr<AnimatableValue> height)
|
| + AnimatableLengthSize(PassRefPtrWillBeRawPtr<AnimatableValue> width, PassRefPtrWillBeRawPtr<AnimatableValue> height)
|
| : m_width(width)
|
| , m_height(height)
|
| {
|
| @@ -58,8 +60,8 @@ private:
|
| virtual AnimatableType type() const OVERRIDE { return TypeLengthSize; }
|
| virtual bool equalTo(const AnimatableValue*) const OVERRIDE;
|
|
|
| - RefPtr<AnimatableValue> m_width;
|
| - RefPtr<AnimatableValue> m_height;
|
| + RefPtrWillBeMember<AnimatableValue> m_width;
|
| + RefPtrWillBeMember<AnimatableValue> m_height;
|
| };
|
|
|
| DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthSize, isLengthSize());
|
|
|