| Index: Source/core/animation/LengthBoxStyleInterpolation.cpp
|
| diff --git a/Source/core/animation/LengthBoxStyleInterpolation.cpp b/Source/core/animation/LengthBoxStyleInterpolation.cpp
|
| index 53440c0aae4c8741b248d0a92d6d43adae1c025b..067c6bb9eee62fc85a7a9dad483f4b6252a004f8 100644
|
| --- a/Source/core/animation/LengthBoxStyleInterpolation.cpp
|
| +++ b/Source/core/animation/LengthBoxStyleInterpolation.cpp
|
| @@ -31,10 +31,10 @@ PassRefPtrWillBeRawPtr<LengthBoxStyleInterpolation> LengthBoxStyleInterpolation:
|
| return nullptr;
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<InterpolableValue> LengthBoxStyleInterpolation::lengthBoxtoInterpolableValue(const CSSValue& lengthBox, const CSSValue& matchingValue, bool isEndInterpolation)
|
| +PassOwnPtr<InterpolableValue> LengthBoxStyleInterpolation::lengthBoxtoInterpolableValue(const CSSValue& lengthBox, const CSSValue& matchingValue, bool isEndInterpolation)
|
| {
|
| const int numberOfSides = 4;
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(numberOfSides);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(numberOfSides);
|
| Rect* rect = toCSSPrimitiveValue(lengthBox).getRectValue();
|
| Rect* matchingRect = toCSSPrimitiveValue(matchingValue).getRectValue();
|
| CSSPrimitiveValue* side[numberOfSides] = { rect->left(), rect->right(), rect->top(), rect->bottom() };
|
| @@ -65,7 +65,7 @@ bool LengthBoxStyleInterpolation::usesDefaultInterpolation(const CSSValue& start
|
|
|
| namespace {
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> indexedValueToLength(InterpolableList& lengthBox, size_t i, CSSPrimitiveValue* start[], CSSPrimitiveValue* end[])
|
| +PassRefPtr<CSSPrimitiveValue> indexedValueToLength(InterpolableList& lengthBox, size_t i, CSSPrimitiveValue* start[], CSSPrimitiveValue* end[])
|
| {
|
| if (lengthBox.get(i)->isBool()) {
|
| if (toInterpolableBool(lengthBox.get(i))->value())
|
| @@ -77,14 +77,14 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> indexedValueToLength(InterpolableList&
|
|
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> LengthBoxStyleInterpolation::interpolableValueToLengthBox(InterpolableValue* value, const CSSValue& originalStart, const CSSValue& originalEnd)
|
| +PassRefPtr<CSSValue> LengthBoxStyleInterpolation::interpolableValueToLengthBox(InterpolableValue* value, const CSSValue& originalStart, const CSSValue& originalEnd)
|
| {
|
| InterpolableList* lengthBox = toInterpolableList(value);
|
| Rect* startRect = toCSSPrimitiveValue(originalStart).getRectValue();
|
| Rect* endRect = toCSSPrimitiveValue(originalEnd).getRectValue();
|
| CSSPrimitiveValue* startSides[4] = { startRect->left(), startRect->right(), startRect->top(), startRect->bottom() };
|
| CSSPrimitiveValue* endSides[4] = { endRect->left(), endRect->right(), endRect->top(), endRect->bottom() };
|
| - RefPtrWillBeRawPtr<Rect> result = Rect::create();
|
| + RefPtr<Rect> result = Rect::create();
|
|
|
| result->setLeft(indexedValueToLength(*lengthBox, 0, startSides, endSides));
|
| result->setRight(indexedValueToLength(*lengthBox, 1, startSides, endSides));
|
| @@ -105,8 +105,6 @@ void LengthBoxStyleInterpolation::apply(StyleResolverState& state) const
|
| DEFINE_TRACE(LengthBoxStyleInterpolation)
|
| {
|
| StyleInterpolation::trace(visitor);
|
| - visitor->trace(m_startCSSValue);
|
| - visitor->trace(m_endCSSValue);
|
| }
|
|
|
| }
|
|
|