Index: third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.cpp |
diff --git a/third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.cpp |
index 2a6051e3c9e2b8bb6c169e28a0ff46938ed7b369..27447e3ebbb9320e4d4eb29f304a21c6cd17a0d9 100644 |
--- a/third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.cpp |
+++ b/third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.cpp |
@@ -78,7 +78,7 @@ DEFINE_NON_INTERPOLABLE_VALUE_TYPE_CASTS(CSSImageSliceNonInterpolableValue); |
namespace { |
class UnderlyingSliceTypesChecker |
- : public InterpolationType::ConversionChecker { |
+ : public CSSInterpolationType::CSSConversionChecker { |
public: |
static std::unique_ptr<UnderlyingSliceTypesChecker> Create( |
const SliceTypes& underlying_types) { |
@@ -96,7 +96,7 @@ class UnderlyingSliceTypesChecker |
UnderlyingSliceTypesChecker(const SliceTypes& underlying_types) |
: underlying_types_(underlying_types) {} |
- bool IsValid(const InterpolationEnvironment&, |
+ bool IsValid(const StyleResolverState&, |
const InterpolationValue& underlying) const final { |
return underlying_types_ == GetUnderlyingSliceTypes(underlying); |
} |
@@ -104,7 +104,8 @@ class UnderlyingSliceTypesChecker |
const SliceTypes underlying_types_; |
}; |
-class InheritedSliceTypesChecker : public InterpolationType::ConversionChecker { |
+class InheritedSliceTypesChecker |
+ : public CSSInterpolationType::CSSConversionChecker { |
public: |
static std::unique_ptr<InheritedSliceTypesChecker> Create( |
CSSPropertyID property, |
@@ -118,11 +119,11 @@ class InheritedSliceTypesChecker : public InterpolationType::ConversionChecker { |
const SliceTypes& inherited_types) |
: property_(property), inherited_types_(inherited_types) {} |
- bool IsValid(const InterpolationEnvironment& environment, |
+ bool IsValid(const StyleResolverState& state, |
const InterpolationValue& underlying) const final { |
return inherited_types_ == |
SliceTypes(ImageSlicePropertyFunctions::GetImageSlice( |
- property_, *environment.GetState().ParentStyle())); |
+ property_, *state.ParentStyle())); |
} |
const CSSPropertyID property_; |