LibWeb: Remove FilterValueListStyleValue

Drop the obsolete filter list wrapper and FilterValue variant now that
filter lists are represented by StyleValueList entries containing
FilterStyleValue objects.

Author: AtkinsSJ

Libraries/LibWeb/CMakeLists.txt

@@ -282,7 +282,6 @@ set(SOURCES
     CSS/StyleValues/EasingStyleValue.cpp
     CSS/StyleValues/EdgeStyleValue.cpp
     CSS/StyleValues/FilterStyleValue.cpp
-    CSS/StyleValues/FilterValueListStyleValue.cpp
     CSS/StyleValues/FunctionStyleValue.cpp
     CSS/StyleValues/FontSourceStyleValue.cpp
     CSS/StyleValues/FontStyleStyleValue.cpp

Libraries/LibWeb/CSS/Interpolation.cpp

@@ -223,7 +223,7 @@ static bool contains_url(StyleValueList const& list)
 // https://drafts.fxtf.org/filter-effects/#interpolation-of-filters
 static RefPtr<StyleValue const> interpolate_filter_value_list(DOM::Element& element, CalculationContext const& calculation_context, StyleValue const& a_from, StyleValue const& a_to, float delta, AllowDiscrete allow_discrete)
 {
-    auto is_filter_value_list_without_url = [](StyleValue const& value) {
+    auto is_interpolable_filter_list = [](StyleValue const& value) {
         if (!is_filter_style_value_list(value))
             return false;
         return !contains_url(value.as_value_list());
@@ -247,7 +247,7 @@ static RefPtr<StyleValue const> interpolate_filter_value_list(DOM::Element& elem
         return make_filter_value_list(move(interpolated_filter_values));
     };
 
-    if (is_filter_value_list_without_url(a_from) && is_filter_value_list_without_url(a_to)) {
+    if (is_interpolable_filter_list(a_from) && is_interpolable_filter_list(a_to)) {
         auto const& from_list = a_from.as_value_list();
         auto const& to_list = a_to.as_value_list();
         // If both filters have a <filter-value-list> of same length without <url> and for each <filter-function> for which there is a corresponding item in each list
@@ -273,8 +273,8 @@ static RefPtr<StyleValue const> interpolate_filter_value_list(DOM::Element& elem
     }
 
     // If one filter is none and the other is a <filter-value-list> without <url>
-    if ((is_filter_value_list_without_url(a_from) && a_to.to_keyword() == Keyword::None)
-        || (is_filter_value_list_without_url(a_to) && a_from.to_keyword() == Keyword::None)) {
+    if ((is_interpolable_filter_list(a_from) && a_to.to_keyword() == Keyword::None)
+        || (is_interpolable_filter_list(a_to) && a_from.to_keyword() == Keyword::None)) {
 
         // 1. Replace none with the corresponding <filter-value-list> of the other filter. The new <filter-function>s must be initialized to their initial values for interpolation.
         auto replace_none_with_initial_filter_list_values = [&](StyleValueList const& filter_value_list) {

Libraries/LibWeb/CSS/StyleValues/FilterValueListStyleValue.cpp

@@ -40,7 +40,6 @@
 #include <LibWeb/CSS/StyleValues/EdgeStyleValue.h>
 #include <LibWeb/CSS/StyleValues/EmptyOptionalStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FilterStyleValue.h>
-#include <LibWeb/CSS/StyleValues/FilterValueListStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FontSourceStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FontStyleStyleValue.h>

Libraries/LibWeb/CSS/StyleValues/FilterValueListStyleValue.h

@@ -61,7 +61,6 @@ namespace Web::CSS {
     __ENUMERATE_CSS_STYLE_VALUE_TYPE(Edge, edge, EdgeStyleValue)                                                               \
     __ENUMERATE_CSS_STYLE_VALUE_TYPE(EmptyOptional, empty_optional, EmptyOptionalStyleValue)                                   \
     __ENUMERATE_CSS_STYLE_VALUE_TYPE(Filter, filter, FilterStyleValue)                                                         \
-    __ENUMERATE_CSS_STYLE_VALUE_TYPE(FilterValueList, filter_value_list, FilterValueListStyleValue)                            \
     __ENUMERATE_CSS_STYLE_VALUE_TYPE(Function, function, FunctionStyleValue)                                                   \
     __ENUMERATE_CSS_STYLE_VALUE_TYPE(Flex, flex, FlexStyleValue)                                                               \
     __ENUMERATE_CSS_STYLE_VALUE_TYPE(FontSource, font_source, FontSourceStyleValue)                                            \

Libraries/LibWeb/CSS/StyleValues/StyleValue.cpp

@@ -215,15 +215,6 @@ class SubtleCrypto;
 
 }
 
-namespace Web::CSS::FilterOperation {
-
-struct Blur;
-struct DropShadow;
-struct HueRotate;
-struct Color;
-
-}
-
 namespace Web::CSS {
 
 class AbstractImageStyleValue;
@@ -332,7 +323,6 @@ class EmptyOptionalStyleValue;
 class ExplicitGridTrack;
 class FeatureValue;
 class FilterStyleValue;
-class FilterValueListStyleValue;
 class Flex;
 class FlexStyleValue;
 class FontComputer;
@@ -511,8 +501,6 @@ using PaintOrderList = Array<PaintOrder, 3>;
 using StyleValueVector = Vector<ValueComparingNonnullRefPtr<StyleValue const>>;
 using StyleValueTuple = Vector<ValueComparingRefPtr<StyleValue const>>;
 
-using FilterValue = Variant<FilterOperation::Blur, FilterOperation::DropShadow, FilterOperation::HueRotate, FilterOperation::Color, URL>;
-
 }
 
 namespace Web::CSS::Invalidation {