| Index: third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp
|
| index 0585654661daedc8925a2c1f02a11a3039e32627..da07eba6a857fcb361dba0dc7500e48a732d8321 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp
|
| @@ -18,7 +18,7 @@ namespace blink {
|
| namespace {
|
|
|
| class UnderlyingFilterListChecker
|
| - : public InterpolationType::ConversionChecker {
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| static std::unique_ptr<UnderlyingFilterListChecker> Create(
|
| PassRefPtr<NonInterpolableList> non_interpolable_list) {
|
| @@ -26,7 +26,7 @@ class UnderlyingFilterListChecker
|
| new UnderlyingFilterListChecker(std::move(non_interpolable_list)));
|
| }
|
|
|
| - bool IsValid(const InterpolationEnvironment&,
|
| + bool IsValid(const StyleResolverState&,
|
| const InterpolationValue& underlying) const final {
|
| const NonInterpolableList& underlying_non_interpolable_list =
|
| ToNonInterpolableList(*underlying.non_interpolable_value);
|
| @@ -50,7 +50,8 @@ class UnderlyingFilterListChecker
|
| RefPtr<NonInterpolableList> non_interpolable_list_;
|
| };
|
|
|
| -class InheritedFilterListChecker : public InterpolationType::ConversionChecker {
|
| +class InheritedFilterListChecker
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| static std::unique_ptr<InheritedFilterListChecker> Create(
|
| CSSPropertyID property,
|
| @@ -59,13 +60,12 @@ class InheritedFilterListChecker : public InterpolationType::ConversionChecker {
|
| new InheritedFilterListChecker(property, filter_operations));
|
| }
|
|
|
| - bool IsValid(const InterpolationEnvironment& environment,
|
| + bool IsValid(const StyleResolverState& state,
|
| const InterpolationValue&) const final {
|
| const FilterOperations& filter_operations =
|
| filter_operations_wrapper_->Operations();
|
| - return filter_operations ==
|
| - FilterListPropertyFunctions::GetFilterList(
|
| - property_, *environment.GetState().ParentStyle());
|
| + return filter_operations == FilterListPropertyFunctions::GetFilterList(
|
| + property_, *state.ParentStyle());
|
| }
|
|
|
| private:
|
|
|