Index: Source/core/animation/InterpolableValue.h |
diff --git a/Source/core/animation/InterpolableValue.h b/Source/core/animation/InterpolableValue.h |
index 65c20eb8360cce0cb0e48d90b614a8815cae6ecc..fad19c4429ac50ef5dc4f214b81aa36a5800c8b4 100644 |
--- a/Source/core/animation/InterpolableValue.h |
+++ b/Source/core/animation/InterpolableValue.h |
@@ -14,15 +14,14 @@ |
namespace blink { |
-class CORE_EXPORT InterpolableValue : public NoBaseWillBeGarbageCollected<InterpolableValue> { |
- DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(InterpolableValue); |
+class CORE_EXPORT InterpolableValue : public GarbageCollected<InterpolableValue> { |
public: |
virtual bool isNumber() const { return false; } |
virtual bool isBool() const { return false; } |
virtual bool isList() const { return false; } |
virtual bool isAnimatableValue() const { return false; } |
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const = 0; |
+ virtual InterpolableValue* clone() const = 0; |
DEFINE_INLINE_VIRTUAL_TRACE() { } |
@@ -45,14 +44,14 @@ private: |
class CORE_EXPORT InterpolableNumber final : public InterpolableValue { |
public: |
- static PassOwnPtrWillBeRawPtr<InterpolableNumber> create(double value) |
+ static InterpolableNumber* create(double value) |
{ |
- return adoptPtrWillBeNoop(new InterpolableNumber(value)); |
+ return new InterpolableNumber(value); |
} |
virtual bool isNumber() const override final { return true; } |
double value() const { return m_value; } |
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); } |
+ virtual InterpolableValue* clone() const override final { return create(m_value); } |
private: |
virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; |
@@ -69,14 +68,14 @@ private: |
class CORE_EXPORT InterpolableBool final : public InterpolableValue { |
public: |
- static PassOwnPtrWillBeRawPtr<InterpolableBool> create(bool value) |
+ static InterpolableBool* create(bool value) |
{ |
- return adoptPtrWillBeNoop(new InterpolableBool(value)); |
+ return new InterpolableBool(value); |
} |
virtual bool isBool() const override final { return true; } |
bool value() const { return m_value; } |
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); } |
+ virtual InterpolableValue* clone() const override final { return create(m_value); } |
private: |
virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; |
@@ -101,18 +100,18 @@ public: |
// has its own copy constructor. So just delete operator= here. |
InterpolableList& operator=(const InterpolableList&) = delete; |
- static PassOwnPtrWillBeRawPtr<InterpolableList> create(const InterpolableList &other) |
+ static InterpolableList* create(const InterpolableList &other) |
{ |
- return adoptPtrWillBeNoop(new InterpolableList(other)); |
+ return new InterpolableList(other); |
} |
- static PassOwnPtrWillBeRawPtr<InterpolableList> create(size_t size) |
+ static InterpolableList* create(size_t size) |
{ |
- return adoptPtrWillBeNoop(new InterpolableList(size)); |
+ return new InterpolableList(size); |
} |
virtual bool isList() const override final { return true; } |
- void set(size_t position, PassOwnPtrWillBeRawPtr<InterpolableValue> value) |
+ void set(size_t position, InterpolableValue* value) |
{ |
ASSERT(position < m_size); |
m_values[position] = value; |
@@ -123,7 +122,7 @@ public: |
return m_values[position].get(); |
} |
size_t length() const { return m_size; } |
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(*this); } |
+ virtual InterpolableValue* clone() const override final { return create(*this); } |
DECLARE_VIRTUAL_TRACE(); |
@@ -146,20 +145,20 @@ private: |
} |
size_t m_size; |
- WillBeHeapVector<OwnPtrWillBeMember<InterpolableValue>> m_values; |
+ HeapVector<Member<InterpolableValue>> m_values; |
}; |
// FIXME: Remove this when we can. |
class InterpolableAnimatableValue : public InterpolableValue { |
public: |
- static PassOwnPtrWillBeRawPtr<InterpolableAnimatableValue> create(PassRefPtrWillBeRawPtr<AnimatableValue> value) |
+ static InterpolableAnimatableValue* create(AnimatableValue* value) |
{ |
- return adoptPtrWillBeNoop(new InterpolableAnimatableValue(value)); |
+ return new InterpolableAnimatableValue(value); |
} |
virtual bool isAnimatableValue() const override final { return true; } |
AnimatableValue* value() const { return m_value.get(); } |
- virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override final { return create(m_value); } |
+ virtual InterpolableValue* clone() const override final { return create(m_value); } |
DECLARE_VIRTUAL_TRACE(); |
@@ -167,9 +166,9 @@ private: |
virtual void interpolate(const InterpolableValue &to, const double progress, InterpolableValue& result) const override final; |
virtual void add(const InterpolableValue& rhs, InterpolableValue& result) const override final { ASSERT_NOT_REACHED(); } |
virtual void multiply(double scalar, InterpolableValue& result) const override final { ASSERT_NOT_REACHED(); } |
- RefPtrWillBeMember<AnimatableValue> m_value; |
+ Member<AnimatableValue> m_value; |
- InterpolableAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value) |
+ InterpolableAnimatableValue(AnimatableValue* value) |
: m_value(value) |
{ |
} |