| Index: third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| index 4635b49cb99cc3375b1c247ad78af5c55dbd6bd4..a6f18637511694a84cda578c94791ef1dc306cce 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| @@ -62,7 +62,8 @@ std::unique_ptr<InterpolableValue> CreateScaleIdentity() {
|
| return std::move(list);
|
| }
|
|
|
| -class InheritedScaleChecker : public InterpolationType::ConversionChecker {
|
| +class InheritedScaleChecker
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| static std::unique_ptr<InheritedScaleChecker> Create(const Scale& scale) {
|
| return WTF::WrapUnique(new InheritedScaleChecker(scale));
|
| @@ -71,9 +72,9 @@ class InheritedScaleChecker : public InterpolationType::ConversionChecker {
|
| private:
|
| InheritedScaleChecker(const Scale& scale) : scale_(scale) {}
|
|
|
| - bool IsValid(const InterpolationEnvironment& environment,
|
| + bool IsValid(const StyleResolverState& state,
|
| const InterpolationValue&) const final {
|
| - return scale_ == Scale(environment.GetState().ParentStyle()->Scale());
|
| + return scale_ == Scale(state.ParentStyle()->Scale());
|
| }
|
|
|
| const Scale scale_;
|
|
|