| Index: Source/core/animation/animatable/AnimatableLengthBoxAndBool.h
|
| diff --git a/Source/core/animation/animatable/AnimatableLengthBoxAndBool.h b/Source/core/animation/animatable/AnimatableLengthBoxAndBool.h
|
| index 56dc8ed6fe3a67a8b2e8cea1160c90f44b063e88..b3e3c9be467d25beb74c8ab4c1e5e327449393aa 100644
|
| --- a/Source/core/animation/animatable/AnimatableLengthBoxAndBool.h
|
| +++ b/Source/core/animation/animatable/AnimatableLengthBoxAndBool.h
|
| @@ -38,21 +38,19 @@ namespace blink {
|
| class AnimatableLengthBoxAndBool final : public AnimatableValue {
|
| public:
|
| ~AnimatableLengthBoxAndBool() override { }
|
| - static PassRefPtrWillBeRawPtr<AnimatableLengthBoxAndBool> create(PassRefPtrWillBeRawPtr<AnimatableValue> box, bool flag)
|
| + static PassRefPtr<AnimatableLengthBoxAndBool> create(PassRefPtr<AnimatableValue> box, bool flag)
|
| {
|
| - return adoptRefWillBeNoop(new AnimatableLengthBoxAndBool(box, flag));
|
| + return adoptRef(new AnimatableLengthBoxAndBool(box, flag));
|
| }
|
| const AnimatableValue* box() const { return m_box.get(); }
|
| bool flag() const { return m_flag; }
|
|
|
| - DECLARE_VIRTUAL_TRACE();
|
| -
|
| protected:
|
| - PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override;
|
| + PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override;
|
| bool usesDefaultInterpolationWith(const AnimatableValue*) const override;
|
|
|
| private:
|
| - AnimatableLengthBoxAndBool(PassRefPtrWillBeRawPtr<AnimatableValue> box, bool flag)
|
| + AnimatableLengthBoxAndBool(PassRefPtr<AnimatableValue> box, bool flag)
|
| : m_box(box)
|
| , m_flag(flag)
|
| {
|
| @@ -60,7 +58,7 @@ private:
|
| AnimatableType type() const override { return TypeLengthBoxAndBool; }
|
| bool equalTo(const AnimatableValue*) const override;
|
|
|
| - RefPtrWillBeMember<AnimatableValue> m_box;
|
| + RefPtr<AnimatableValue> m_box;
|
| bool m_flag;
|
| };
|
|
|
|
|