Index: third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp |
diff --git a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp |
index a01a63a7b524c4029715ddb976b24bb0f37ff9ee..724e008fa1a293080895bfe022990f5e7bde1f6b 100644 |
--- a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp |
+++ b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp |
@@ -16,7 +16,7 @@ namespace blink { |
namespace { |
-class IsMonospaceChecker : public InterpolationType::ConversionChecker { |
+class IsMonospaceChecker : public CSSInterpolationType::CSSConversionChecker { |
public: |
static std::unique_ptr<IsMonospaceChecker> Create(bool is_monospace) { |
return WTF::WrapUnique(new IsMonospaceChecker(is_monospace)); |
@@ -25,16 +25,16 @@ class IsMonospaceChecker : public InterpolationType::ConversionChecker { |
private: |
IsMonospaceChecker(bool is_monospace) : is_monospace_(is_monospace) {} |
- bool IsValid(const InterpolationEnvironment& environment, |
+ bool IsValid(const StyleResolverState& state, |
const InterpolationValue&) const final { |
- return is_monospace_ == |
- environment.GetState().Style()->GetFontDescription().IsMonospace(); |
+ return is_monospace_ == state.Style()->GetFontDescription().IsMonospace(); |
} |
const bool is_monospace_; |
}; |
-class InheritedFontSizeChecker : public InterpolationType::ConversionChecker { |
+class InheritedFontSizeChecker |
+ : public CSSInterpolationType::CSSConversionChecker { |
public: |
static std::unique_ptr<InheritedFontSizeChecker> Create( |
const FontDescription::Size& inherited_font_size) { |
@@ -45,10 +45,10 @@ class InheritedFontSizeChecker : public InterpolationType::ConversionChecker { |
InheritedFontSizeChecker(const FontDescription::Size& inherited_font_size) |
: inherited_font_size_(inherited_font_size.value) {} |
- bool IsValid(const InterpolationEnvironment& environment, |
+ bool IsValid(const StyleResolverState& state, |
const InterpolationValue&) const final { |
return inherited_font_size_ == |
- environment.GetState().ParentFontDescription().GetSize().value; |
+ state.ParentFontDescription().GetSize().value; |
} |
const float inherited_font_size_; |