Chromium Code Reviews| Index: Source/core/animation/LengthPairStyleInterpolation.cpp |
| diff --git a/Source/core/animation/LengthPairStyleInterpolation.cpp b/Source/core/animation/LengthPairStyleInterpolation.cpp |
| index 32df55446f47933b018da9cd8fcac637b0ab92a3..3163918538882904895237f647ba6f662d0a56be 100644 |
| --- a/Source/core/animation/LengthPairStyleInterpolation.cpp |
| +++ b/Source/core/animation/LengthPairStyleInterpolation.cpp |
| @@ -29,15 +29,15 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> LengthPairStyleInterpolation::lengthPa |
| static inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toPrimitiveValue(PassRefPtrWillBeRawPtr<CSSValue> value) |
| { |
| - return adoptRefWillBeNoop(toCSSPrimitiveValue(value.leakRef())); |
| + return adoptRef(toCSSPrimitiveValue(value.leakRef())); |
| } |
| PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValueToLengthPair(InterpolableValue* value, ValueRange range) |
| { |
| InterpolableList* lengthPair = toInterpolableList(value); |
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> first = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(0), range)); |
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> second = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(1), range)); |
| - RefPtrWillBeRawPtr<Pair> result = Pair::create(first, second, Pair::KeepIdenticalValues); |
| + RefPtr<CSSPrimitiveValue> first = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(0), range)); |
|
Eric Willigers
2014/12/19 03:16:29
RefPtrWillBeRawPtr was better - an Oilpan trybot w
evemj (not active)
2014/12/19 04:43:08
Done.
|
| + RefPtr<CSSPrimitiveValue> second = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(1), range)); |
| + RefPtr<Pair> result = Pair::create(first, second, Pair::KeepIdenticalValues); |
| return CSSPrimitiveValue::create(result.release()); |
| } |
| @@ -47,4 +47,8 @@ void LengthPairStyleInterpolation::apply(StyleResolverState& state) const |
| StyleBuilder::applyProperty(m_id, state, interpolableValueToLengthPair(m_cachedValue.get(), m_range).get()); |
| } |
| -} // namespace blink |
| +void LengthPairStyleInterpolation::trace(Visitor* visitor) |
| +{ |
| + StyleInterpolation::trace(visitor); |
| +} |
| +} |