| Index: third_party/WebKit/Source/core/animation/CSSValueInterpolationType.h
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.h b/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.h
|
| index 606859bd6dc6f64bef77412e4cc9644b2efa3dbe..5cc8b3b0e51ce1292e17bb442f0bd3fe09f3b887 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.h
|
| +++ b/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.h
|
| @@ -25,39 +25,25 @@ class CSSValueInterpolationType : public CSSInterpolationType {
|
| return nullptr;
|
| }
|
|
|
| - InterpolationValue maybeConvertSingle(const PropertySpecificKeyframe&,
|
| - const InterpolationEnvironment&,
|
| - const InterpolationValue& underlying,
|
| - ConversionCheckers&) const final;
|
| -
|
| InterpolationValue maybeConvertStandardPropertyUnderlyingValue(
|
| const StyleResolverState&) const final {
|
| return nullptr;
|
| }
|
|
|
| - // As we override CSSInterpolationType::maybeConvertSingle, these are never
|
| - // called.
|
| InterpolationValue maybeConvertNeutral(const InterpolationValue& underlying,
|
| ConversionCheckers&) const final {
|
| - NOTREACHED();
|
| + // This type will never interpolate or composite with the underlying value.
|
| + // Returning nullptr here means no value will be applied and the value in
|
| + // ComputedStyle will remain unchanged.
|
| return nullptr;
|
| }
|
| InterpolationValue maybeConvertInitial(const StyleResolverState&,
|
| - ConversionCheckers&) const final {
|
| - NOTREACHED();
|
| - return nullptr;
|
| - }
|
| + ConversionCheckers&) const final;
|
| InterpolationValue maybeConvertInherit(const StyleResolverState&,
|
| - ConversionCheckers&) const final {
|
| - NOTREACHED();
|
| - return nullptr;
|
| - }
|
| + ConversionCheckers&) const final;
|
| InterpolationValue maybeConvertValue(const CSSValue& value,
|
| const StyleResolverState&,
|
| - ConversionCheckers&) const final {
|
| - NOTREACHED();
|
| - return nullptr;
|
| - }
|
| + ConversionCheckers&) const final;
|
|
|
| void composite(UnderlyingValueOwner& underlyingValueOwner,
|
| double underlyingFraction,
|
|
|