Index: Source/core/animation/ListStyleInterpolation.h |
diff --git a/Source/core/animation/ListStyleInterpolation.h b/Source/core/animation/ListStyleInterpolation.h |
index 014883274edd8d1894a8ba004c629d8b0dd47d3a..7ccdba774815ab29d5349df64ba063c1c864d578 100644 |
--- a/Source/core/animation/ListStyleInterpolation.h |
+++ b/Source/core/animation/ListStyleInterpolation.h |
@@ -29,8 +29,8 @@ public: |
Vector<typename InterpolationType::NonInterpolableType> startNonInterpolableData; |
- OwnPtrWillBeRawPtr<InterpolableValue> startValue = listToInterpolableValue(start, &startNonInterpolableData); |
- OwnPtrWillBeRawPtr<InterpolableValue> endValue = listToInterpolableValue(end); |
+ OwnPtr<InterpolableValue> startValue = listToInterpolableValue(start, &startNonInterpolableData); |
+ OwnPtr<InterpolableValue> endValue = listToInterpolableValue(end); |
return adoptRefWillBeNoop(new ListStyleInterpolationImpl<InterpolationType, NonInterpolableData>(startValue.release(), endValue.release(), id, startNonInterpolableData, range)); |
} |
@@ -43,7 +43,7 @@ public: |
} |
private: |
- ListStyleInterpolationImpl(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id, |
+ ListStyleInterpolationImpl(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, CSSPropertyID id, |
Vector<typename InterpolationType::NonInterpolableType> nonInterpolableData, InterpolationRange range = RangeAll) |
: StyleInterpolation(start, end, id) |
, m_range(range) |
@@ -55,12 +55,12 @@ private: |
Vector<typename InterpolationType::NonInterpolableType> m_nonInterpolableData; |
- static PassOwnPtrWillBeRawPtr<InterpolableValue> listToInterpolableValue(const CSSValue& value, Vector<typename InterpolationType::NonInterpolableType>* nonInterpolableData = nullptr) |
+ static PassOwnPtr<InterpolableValue> listToInterpolableValue(const CSSValue& value, Vector<typename InterpolationType::NonInterpolableType>* nonInterpolableData = nullptr) |
{ |
const CSSValueList& listValue = toCSSValueList(value); |
if (nonInterpolableData) |
nonInterpolableData->reserveCapacity(listValue.length()); |
- OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(listValue.length()); |
+ OwnPtr<InterpolableList> result = InterpolableList::create(listValue.length()); |
typename InterpolationType::NonInterpolableType elementData = typename InterpolationType::NonInterpolableType(); |
for (size_t i = 0; i < listValue.length(); i++) { |
result->set(i, InterpolationType::toInterpolableValue(*listValue.item(i), elementData)); |
@@ -70,10 +70,10 @@ private: |
return result.release(); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToList(InterpolableValue* value, const Vector<typename InterpolationType::NonInterpolableType>& nonInterpolableData, InterpolationRange range = RangeAll) |
+ static PassRefPtr<CSSValue> interpolableValueToList(InterpolableValue* value, const Vector<typename InterpolationType::NonInterpolableType>& nonInterpolableData, InterpolationRange range = RangeAll) |
{ |
InterpolableList* listValue = toInterpolableList(value); |
- RefPtrWillBeRawPtr<CSSValueList> result = CSSValueList::createCommaSeparated(); |
+ RefPtr<CSSValueList> result = CSSValueList::createCommaSeparated(); |
ASSERT(nonInterpolableData.size() == listValue->length()); |
@@ -108,26 +108,26 @@ public: |
} |
private: |
- ListStyleInterpolationImpl(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id, InterpolationRange range = RangeAll) |
+ ListStyleInterpolationImpl(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, CSSPropertyID id, InterpolationRange range = RangeAll) |
: StyleInterpolation(start, end, id), m_range(range) |
{ |
} |
InterpolationRange m_range; |
- static PassOwnPtrWillBeRawPtr<InterpolableValue> listToInterpolableValue(const CSSValue& value) |
+ static PassOwnPtr<InterpolableValue> listToInterpolableValue(const CSSValue& value) |
{ |
const CSSValueList& listValue = toCSSValueList(value); |
- OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(listValue.length()); |
+ OwnPtr<InterpolableList> result = InterpolableList::create(listValue.length()); |
for (size_t i = 0; i < listValue.length(); i++) |
result->set(i, InterpolationType::toInterpolableValue(*listValue.item(i))); |
return result.release(); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToList(InterpolableValue* value, InterpolationRange range = RangeAll) |
+ static PassRefPtr<CSSValue> interpolableValueToList(InterpolableValue* value, InterpolationRange range = RangeAll) |
{ |
InterpolableList* listValue = toInterpolableList(value); |
- RefPtrWillBeRawPtr<CSSValueList> result = CSSValueList::createCommaSeparated(); |
+ RefPtr<CSSValueList> result = CSSValueList::createCommaSeparated(); |
for (size_t i = 0; i < listValue->length(); i++) |
result->append(InterpolationType::fromInterpolableValue(*(listValue->get(i)), range)); |