| Index: third_party/WebKit/Source/core/animation/CSSInterpolationType.h
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSInterpolationType.h b/third_party/WebKit/Source/core/animation/CSSInterpolationType.h
|
| index e4df886a16be9454749bfb9bddf7e710e1eb8ef7..33ffb565438dbeb72cab274fde29ad78dc0bbfa5 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSInterpolationType.h
|
| +++ b/third_party/WebKit/Source/core/animation/CSSInterpolationType.h
|
| @@ -20,23 +20,22 @@ protected:
|
|
|
| CSSPropertyID cssProperty() const { return property().cssProperty(); }
|
|
|
| - virtual PassOwnPtr<InterpolationValue> maybeConvertSingle(const PropertySpecificKeyframe& keyframe, const InterpolationEnvironment* environment, const UnderlyingValue& underlyingValue, ConversionCheckers& conversionCheckers) const
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertSingle(const PropertySpecificKeyframe& keyframe, const InterpolationEnvironment& environment, const UnderlyingValue& underlyingValue, ConversionCheckers& conversionCheckers) const
|
| {
|
| const CSSValue* value = toCSSPropertySpecificKeyframe(keyframe).value();
|
| - const StyleResolverState* state = environment ? &environment->state() : nullptr;
|
| if (!value)
|
| return maybeConvertNeutral(underlyingValue, conversionCheckers);
|
| if (value->isInitialValue() || (value->isUnsetValue() && !CSSPropertyMetadata::isInheritedProperty(cssProperty())))
|
| return maybeConvertInitial();
|
| if (value->isInheritedValue() || (value->isUnsetValue() && CSSPropertyMetadata::isInheritedProperty(cssProperty())))
|
| - return maybeConvertInherit(state, conversionCheckers);
|
| - return maybeConvertValue(*value, state, conversionCheckers);
|
| + return maybeConvertInherit(environment.state(), conversionCheckers);
|
| + return maybeConvertValue(*value, environment.state(), conversionCheckers);
|
| }
|
|
|
| virtual PassOwnPtr<InterpolationValue> maybeConvertNeutral(const UnderlyingValue&, ConversionCheckers&) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| virtual PassOwnPtr<InterpolationValue> maybeConvertInitial() const { ASSERT_NOT_REACHED(); return nullptr; }
|
| - virtual PassOwnPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState*, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| - virtual PassOwnPtr<InterpolationValue> maybeConvertValue(const CSSValue& value, const StyleResolverState*, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState&, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers& conversionCheckers) const { ASSERT_NOT_REACHED(); return nullptr; }
|
| };
|
|
|
| } // namespace blink
|
|
|