| Index: Source/core/animation/InterpolationType.h
|
| diff --git a/Source/core/animation/InterpolationType.h b/Source/core/animation/InterpolationType.h
|
| index 77da872c29b748b96a801765fccd7f05e1a3d009..e42e9694ba39896c5109a17588751538f8d065f9 100644
|
| --- a/Source/core/animation/InterpolationType.h
|
| +++ b/Source/core/animation/InterpolationType.h
|
| @@ -38,18 +38,18 @@ public:
|
| };
|
| using ConversionCheckers = WillBeHeapVector<OwnPtrWillBeMember<ConversionChecker>>;
|
|
|
| - virtual PassOwnPtrWillBeRawPtr<PairwisePrimitiveInterpolation> maybeConvertPairwise(const CSSPropertySpecificKeyframe& startKeyframe, const CSSPropertySpecificKeyframe& endKeyframe, const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| + virtual PassOwnPtr<PairwisePrimitiveInterpolation> maybeConvertPairwise(const CSSPropertySpecificKeyframe& startKeyframe, const CSSPropertySpecificKeyframe& endKeyframe, const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| {
|
| - OwnPtrWillBeRawPtr<InterpolationValue> startValue = maybeConvertSingle(startKeyframe, state, conversionCheckers);
|
| + OwnPtr<InterpolationValue> startValue = maybeConvertSingle(startKeyframe, state, conversionCheckers);
|
| if (!startValue)
|
| return nullptr;
|
| - OwnPtrWillBeRawPtr<InterpolationValue> endValue = maybeConvertSingle(endKeyframe, state, conversionCheckers);
|
| + OwnPtr<InterpolationValue> endValue = maybeConvertSingle(endKeyframe, state, conversionCheckers);
|
| if (!endValue)
|
| return nullptr;
|
| return PairwisePrimitiveInterpolation::create(*this, startValue->m_interpolableValue.release(), endValue->m_interpolableValue.release(), startValue->m_nonInterpolableValue.release());
|
| }
|
|
|
| - virtual PassOwnPtrWillBeRawPtr<InterpolationValue> maybeConvertSingle(const CSSPropertySpecificKeyframe& keyframe, const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertSingle(const CSSPropertySpecificKeyframe& keyframe, const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| {
|
| const CSSValue* value = keyframe.value();
|
| if (!value)
|
| @@ -61,7 +61,7 @@ public:
|
| return maybeConvertValue(*value, state, conversionCheckers);
|
| }
|
|
|
| - virtual PassOwnPtrWillBeRawPtr<InterpolationValue> maybeConvertUnderlyingValue(const StyleResolverState&) const = 0;
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const StyleResolverState&) const = 0;
|
|
|
| virtual void apply(const InterpolableValue&, const NonInterpolableValue*, StyleResolverState&) const = 0;
|
|
|
| @@ -74,10 +74,10 @@ protected:
|
| : m_property(property)
|
| { }
|
|
|
| - virtual PassOwnPtrWillBeRawPtr<InterpolationValue> maybeConvertNeutral() const { ASSERT_NOT_REACHED(); return nullptr; }
|
| - virtual PassOwnPtrWillBeRawPtr<InterpolationValue> maybeConvertInitial() const { ASSERT_NOT_REACHED(); return nullptr; }
|
| - virtual PassOwnPtrWillBeRawPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| - virtual PassOwnPtrWillBeRawPtr<InterpolationValue> maybeConvertValue(const CSSValue& value, const StyleResolverState* state, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertNeutral() const { ASSERT_NOT_REACHED(); return nullptr; }
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertInitial() const { ASSERT_NOT_REACHED(); return nullptr; }
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertValue(const CSSValue& value, const StyleResolverState* state, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
|
|
| const CSSPropertyID m_property;
|
| };
|
|
|