| Index: Source/core/animation/InvalidatableStyleInterpolation.cpp
|
| diff --git a/Source/core/animation/InvalidatableStyleInterpolation.cpp b/Source/core/animation/InvalidatableStyleInterpolation.cpp
|
| index 685df8c737051f0b1fb1f655774a0462cdef2e84..dc8ee16694e1bb2acd382f06b61394afbce53903 100644
|
| --- a/Source/core/animation/InvalidatableStyleInterpolation.cpp
|
| +++ b/Source/core/animation/InvalidatableStyleInterpolation.cpp
|
| @@ -28,10 +28,10 @@ bool InvalidatableStyleInterpolation::maybeCachePairwiseConversion(const StyleRe
|
| for (const auto& interpolationType : m_interpolationTypes) {
|
| if ((m_startKeyframe->isNeutral() || m_endKeyframe->isNeutral()) && (!underlyingValue || underlyingValue->type() != *interpolationType))
|
| continue;
|
| - OwnPtrWillBeRawPtr<PairwisePrimitiveInterpolation> pairwiseConversion = interpolationType->maybeConvertPairwise(*m_startKeyframe, *m_endKeyframe, state, m_conversionCheckers);
|
| + PairwisePrimitiveInterpolation* pairwiseConversion = interpolationType->maybeConvertPairwise(*m_startKeyframe, *m_endKeyframe, state, m_conversionCheckers);
|
| if (pairwiseConversion) {
|
| m_cachedValue = pairwiseConversion->initialValue();
|
| - m_cachedConversion = pairwiseConversion.release();
|
| + m_cachedConversion = pairwiseConversion;
|
| return true;
|
| }
|
| }
|
| @@ -46,27 +46,27 @@ void InvalidatableStyleInterpolation::interpolate(int, double fraction)
|
| // We defer the interpolation to ensureValidInterpolation() if m_cachedConversion is null.
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<InterpolationValue> InvalidatableStyleInterpolation::convertSingleKeyframe(const CSSPropertySpecificKeyframe& keyframe, const StyleResolverState& state, const InterpolationValue* underlyingValue) const
|
| +InterpolationValue* InvalidatableStyleInterpolation::convertSingleKeyframe(const CSSPropertySpecificKeyframe& keyframe, const StyleResolverState& state, const InterpolationValue* underlyingValue) const
|
| {
|
| if (keyframe.isNeutral() && !underlyingValue)
|
| return nullptr;
|
| for (const auto& interpolationType : m_interpolationTypes) {
|
| if (keyframe.isNeutral() && underlyingValue->type() != *interpolationType)
|
| continue;
|
| - OwnPtrWillBeRawPtr<InterpolationValue> result = interpolationType->maybeConvertSingle(keyframe, &state, m_conversionCheckers);
|
| + InterpolationValue* result = interpolationType->maybeConvertSingle(keyframe, &state, m_conversionCheckers);
|
| if (result)
|
| - return result.release();
|
| + return result;
|
| }
|
| ASSERT(keyframe.isNeutral());
|
| return nullptr;
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<InterpolationValue> InvalidatableStyleInterpolation::maybeConvertUnderlyingValue(const StyleResolverState& state) const
|
| +InterpolationValue* InvalidatableStyleInterpolation::maybeConvertUnderlyingValue(const StyleResolverState& state) const
|
| {
|
| for (const auto& interpolationType : m_interpolationTypes) {
|
| - OwnPtrWillBeRawPtr<InterpolationValue> result = interpolationType->maybeConvertUnderlyingValue(state);
|
| + InterpolationValue* result = interpolationType->maybeConvertUnderlyingValue(state);
|
| if (result)
|
| - return result.release();
|
| + return result;
|
| }
|
| return nullptr;
|
| }
|
| @@ -122,8 +122,8 @@ void InvalidatableStyleInterpolation::setFlagIfInheritUsed(StyleResolverState& s
|
|
|
| void InvalidatableStyleInterpolation::apply(StyleResolverState& state) const
|
| {
|
| - OwnPtrWillBeRawPtr<InterpolationValue> underlyingValue = dependsOnUnderlyingValue() ? maybeConvertUnderlyingValue(state) : nullptr;
|
| - ensureValidInterpolation(state, underlyingValue.get());
|
| + InterpolationValue* underlyingValue = dependsOnUnderlyingValue() ? maybeConvertUnderlyingValue(state) : nullptr;
|
| + ensureValidInterpolation(state, underlyingValue);
|
| if (!m_cachedValue)
|
| return;
|
| const InterpolableValue* appliedInterpolableValue = &m_cachedValue->interpolableValue();
|
|
|