| Index: third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp
|
| index b0b53971038642b0638580953d2281c185964e10..d7470aee35fdf3fbb57a340f4b4efbf43d406b5f 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp
|
| @@ -58,7 +58,8 @@ static ClipAutos GetClipAutos(const ComputedStyle& style) {
|
| style.ClipBottom().IsAuto(), style.ClipLeft().IsAuto());
|
| }
|
|
|
| -class InheritedAutosChecker : public InterpolationType::ConversionChecker {
|
| +class InheritedAutosChecker
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| static std::unique_ptr<InheritedAutosChecker> Create(
|
| const ClipAutos& inherited_autos) {
|
| @@ -69,10 +70,9 @@ class InheritedAutosChecker : public InterpolationType::ConversionChecker {
|
| InheritedAutosChecker(const ClipAutos& inherited_autos)
|
| : inherited_autos_(inherited_autos) {}
|
|
|
| - bool IsValid(const InterpolationEnvironment& environment,
|
| + bool IsValid(const StyleResolverState& state,
|
| const InterpolationValue& underlying) const final {
|
| - return inherited_autos_ ==
|
| - GetClipAutos(*environment.GetState().ParentStyle());
|
| + return inherited_autos_ == GetClipAutos(*state.ParentStyle());
|
| }
|
|
|
| const ClipAutos inherited_autos_;
|
| @@ -103,7 +103,8 @@ class CSSClipNonInterpolableValue : public NonInterpolableValue {
|
| DEFINE_NON_INTERPOLABLE_VALUE_TYPE(CSSClipNonInterpolableValue);
|
| DEFINE_NON_INTERPOLABLE_VALUE_TYPE_CASTS(CSSClipNonInterpolableValue);
|
|
|
| -class UnderlyingAutosChecker : public InterpolationType::ConversionChecker {
|
| +class UnderlyingAutosChecker
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| ~UnderlyingAutosChecker() final {}
|
|
|
| @@ -123,7 +124,7 @@ class UnderlyingAutosChecker : public InterpolationType::ConversionChecker {
|
| UnderlyingAutosChecker(const ClipAutos& underlying_autos)
|
| : underlying_autos_(underlying_autos) {}
|
|
|
| - bool IsValid(const InterpolationEnvironment&,
|
| + bool IsValid(const StyleResolverState&,
|
| const InterpolationValue& underlying) const final {
|
| return underlying_autos_ == GetUnderlyingAutos(underlying);
|
| }
|
|
|