LibWeb/CSS: Discard whitespace when parsing comma-separated lists

Author: AtkinsSJ

Libraries/LibWeb/CSS/Parser/PropertyParsing.cpp

@@ -186,6 +186,7 @@ Optional<Parser::PropertyAndValue> Parser::parse_css_value_for_properties(Readon
         return {};
     };
 
+    tokens.discard_whitespace();
     auto& peek_token = tokens.next_token();
 
     auto parse_for_type = [&](ValueType const type) -> Optional<PropertyAndValue> {

Libraries/LibWeb/CSS/Parser/ValueParsing.cpp

@@ -80,7 +80,9 @@ namespace Web::CSS::Parser {
 
 RefPtr<StyleValue const> Parser::parse_comma_separated_value_list(TokenStream<ComponentValue>& tokens, ParseFunction parse_one_value)
 {
+    tokens.discard_whitespace();
     auto first = parse_one_value(tokens);
+    tokens.discard_whitespace();
     if (!first || !tokens.has_next_token())
         return first;
 
@@ -91,8 +93,11 @@ RefPtr<StyleValue const> Parser::parse_comma_separated_value_list(TokenStream<Co
         if (!tokens.consume_a_token().is(Token::Type::Comma))
             return nullptr;
 
+        tokens.discard_whitespace();
+
         if (auto maybe_value = parse_one_value(tokens)) {
             values.append(maybe_value.release_nonnull());
+            tokens.discard_whitespace();
             continue;
         }
         return nullptr;

Tests/LibWeb/Text/expected/wpt-import/css/css-properties-values-api/register-property-syntax-parsing.txt

@@ -2,8 +2,8 @@ Harness status: OK
 
 Found 239 tests
 
-191 Pass
-48 Fail
+197 Pass
+42 Fail
 Pass	syntax:'*', initialValue:'a' is valid
 Pass	syntax:' * ', initialValue:'b' is valid
 Pass	syntax:'<length>', initialValue:'2px' is valid
@@ -30,7 +30,7 @@ Pass	syntax:'<length>', initialValue:'calc(2px*4 + 10px)' is valid
 Pass	syntax:'<length>', initialValue:'7.1e-4cm' is valid
 Pass	syntax:'<length>', initialValue:'calc(7in - 12px)' is valid
 Pass	syntax:'<length>+', initialValue:'2px 7px calc(8px)' is valid
-Fail	syntax:'<length>#', initialValue:'2px, 7px, calc(8px)' is valid
+Pass	syntax:'<length>#', initialValue:'2px, 7px, calc(8px)' is valid
 Pass	syntax:'<percentage>', initialValue:'-9.3e3%' is valid
 Pass	syntax:'<length-percentage>', initialValue:'-54%' is valid
 Pass	syntax:'<length-percentage>', initialValue:'0' is valid
@@ -67,15 +67,15 @@ Pass	syntax:'<string>', initialValue:'"bar baz"' is valid
 Pass	syntax:'<string>', initialValue:'"bar 'baz'"' is valid
 Pass	syntax:'<string>', initialValue:'"bar 'baz'' is valid
 Pass	syntax:'<string>+', initialValue:''foo' 'bar'' is valid
-Fail	syntax:'<string>#', initialValue:''foo', 'bar'' is valid
+Pass	syntax:'<string>#', initialValue:''foo', 'bar'' is valid
 Pass	syntax:'<string>+ | <string>#', initialValue:''foo' 'bar'' is valid
 Pass	syntax:'<string>+ | <string>#', initialValue:' 'foo' 'bar'' is valid
 Pass	syntax:'<string>+ | <string>#', initialValue:''foo' "bar"' is valid
 Pass	syntax:'<string>+ | <string>#', initialValue:''foo' "bar' is valid
-Fail	syntax:'<string># | <string>+', initialValue:''foo', 'bar'' is valid
-Fail	syntax:'<string># | <string>+', initialValue:''foo', 'bar' ' is valid
-Fail	syntax:'<string># | <string>+', initialValue:'"foo", 'bar'' is valid
-Fail	syntax:'<string># | <string>+', initialValue:'"foo", 'bar' is valid
+Pass	syntax:'<string># | <string>+', initialValue:''foo', 'bar'' is valid
+Pass	syntax:'<string># | <string>+', initialValue:''foo', 'bar' ' is valid
+Pass	syntax:'<string># | <string>+', initialValue:'"foo", 'bar'' is valid
+Pass	syntax:'<string># | <string>+', initialValue:'"foo", 'bar' is valid
 Pass	syntax:'<color>', initialValue:'rgb(12, 34, 56)' is valid
 Pass	syntax:'<color>', initialValue:'lightgoldenrodyellow' is valid
 Pass	syntax:'<image>', initialValue:'url(a)' is valid