| Index: third_party/WebKit/Source/core/animation/CSSFontVariationSettingsInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSFontVariationSettingsInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFontVariationSettingsInterpolationType.cpp
|
| index e7b258b0559703265c4a9569dfda8711e1d2b707..a69d3edf9cbd4f5cc31106bda1d99755ab397405 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSFontVariationSettingsInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSFontVariationSettingsInterpolationType.cpp
|
| @@ -70,7 +70,7 @@ class UnderlyingTagsChecker : public InterpolationType::ConversionChecker {
|
| };
|
|
|
| class InheritedFontVariationSettingsChecker
|
| - : public InterpolationType::ConversionChecker {
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| ~InheritedFontVariationSettingsChecker() final {}
|
|
|
| @@ -83,12 +83,11 @@ class InheritedFontVariationSettingsChecker
|
| InheritedFontVariationSettingsChecker(const FontVariationSettings* settings)
|
| : settings_(settings) {}
|
|
|
| - bool IsValid(const InterpolationEnvironment& environment,
|
| + bool IsValid(const StyleResolverState& state,
|
| const InterpolationValue&) const final {
|
| - return DataEquivalent(settings_.Get(), environment.GetState()
|
| - .ParentStyle()
|
| - ->GetFontDescription()
|
| - .VariationSettings());
|
| + return DataEquivalent(
|
| + settings_.Get(),
|
| + state.ParentStyle()->GetFontDescription().VariationSettings());
|
| }
|
|
|
| RefPtr<const FontVariationSettings> settings_;
|
|
|