| Index: Source/core/animation/ListSVGInterpolation.h
|
| diff --git a/Source/core/animation/ListSVGInterpolation.h b/Source/core/animation/ListSVGInterpolation.h
|
| index ad22950462a201bca6a4abb91b9a0b7651ff8b9b..40b4c9083d2a1f42d7639ccff84af23961a0d528 100644
|
| --- a/Source/core/animation/ListSVGInterpolation.h
|
| +++ b/Source/core/animation/ListSVGInterpolation.h
|
| @@ -17,7 +17,7 @@ public:
|
| typedef typename InterpolationType::ListType ListType;
|
| typedef typename InterpolationType::ListType::ItemPropertyType ItemPropertyType;
|
|
|
| - static PassRefPtrWillBeRawPtr<ListSVGInterpolationImpl<InterpolationType, NonInterpolableType>> maybeCreate(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| + static PassRefPtr<ListSVGInterpolationImpl<InterpolationType, NonInterpolableType>> maybeCreate(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| {
|
| ASSERT(start->type() == ListType::classType());
|
| ASSERT(end->type() == ListType::classType());
|
| @@ -35,18 +35,18 @@ public:
|
| }
|
|
|
| Vector<NonInterpolableType> nonInterpolableData(length);
|
| - OwnPtrWillBeRawPtr<InterpolableList> startValue = InterpolableList::create(length);
|
| - OwnPtrWillBeRawPtr<InterpolableList> endValue = InterpolableList::create(length);
|
| + OwnPtr<InterpolableList> startValue = InterpolableList::create(length);
|
| + OwnPtr<InterpolableList> endValue = InterpolableList::create(length);
|
| for (size_t i = 0; i < length; i++) {
|
| startValue->set(i, InterpolationType::toInterpolableValue(startList->at(i), attribute.get(), &nonInterpolableData.at(i)));
|
| endValue->set(i, InterpolationType::toInterpolableValue(endList->at(i), attribute.get(), nullptr));
|
| }
|
|
|
| - return adoptRefWillBeNoop(new ListSVGInterpolationImpl<InterpolationType, NonInterpolableType>(startValue.release(), endValue.release(), attribute, nonInterpolableData));
|
| + return adoptRef(new ListSVGInterpolationImpl<InterpolationType, NonInterpolableType>(startValue.release(), endValue.release(), attribute, nonInterpolableData));
|
| }
|
|
|
| private:
|
| - ListSVGInterpolationImpl(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute, Vector<NonInterpolableType> nonInterpolableData)
|
| + ListSVGInterpolationImpl(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute, Vector<NonInterpolableType> nonInterpolableData)
|
| : SVGInterpolation(start, end, attribute)
|
| {
|
| m_nonInterpolableData.swap(nonInterpolableData);
|
| @@ -74,7 +74,7 @@ class ListSVGInterpolationImpl<InterpolationType, void> : public SVGInterpolatio
|
| public:
|
| typedef typename InterpolationType::ListType ListType;
|
|
|
| - static PassRefPtrWillBeRawPtr<ListSVGInterpolationImpl<InterpolationType, void>> maybeCreate(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| + static PassRefPtr<ListSVGInterpolationImpl<InterpolationType, void>> maybeCreate(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| {
|
| ASSERT(start->type() == ListType::classType());
|
| ASSERT(end->type() == ListType::classType());
|
| @@ -84,24 +84,19 @@ public:
|
| if (startList->length() != endList->length())
|
| return nullptr;
|
|
|
| - return adoptRefWillBeNoop(new ListSVGInterpolationImpl<InterpolationType, void>(toInterpolableValue(startList), toInterpolableValue(endList), attribute));
|
| - }
|
| -
|
| - DEFINE_INLINE_VIRTUAL_TRACE()
|
| - {
|
| - SVGInterpolation::trace(visitor);
|
| + return adoptRef(new ListSVGInterpolationImpl<InterpolationType, void>(toInterpolableValue(startList), toInterpolableValue(endList), attribute));
|
| }
|
|
|
| private:
|
| - ListSVGInterpolationImpl(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| + ListSVGInterpolationImpl(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| : SVGInterpolation(start, end, attribute)
|
| {
|
| }
|
|
|
| - static PassOwnPtrWillBeRawPtr<InterpolableValue> toInterpolableValue(ListType* listValue)
|
| + static PassOwnPtr<InterpolableValue> toInterpolableValue(ListType* listValue)
|
| {
|
| size_t length = listValue->length();
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(length);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(length);
|
| for (size_t i = 0; i < length; i++)
|
| result->set(i, InterpolationType::toInterpolableValue(listValue->at(i)));
|
| return result.release();
|
| @@ -126,7 +121,7 @@ private:
|
| template<typename InterpolationType>
|
| class ListSVGInterpolation {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<ListSVGInterpolationImpl<InterpolationType, typename InterpolationType::NonInterpolableType>> maybeCreate(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| + static PassRefPtr<ListSVGInterpolationImpl<InterpolationType, typename InterpolationType::NonInterpolableType>> maybeCreate(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute)
|
| {
|
| return ListSVGInterpolationImpl<InterpolationType, typename InterpolationType::NonInterpolableType>::maybeCreate(start, end, attribute);
|
| }
|
|
|