mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-15 23:09:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Add method to parse <declaration-value>

Browse source 
This has an extra parameter to allow stopping at the first comma token,
which we need for var() and attr()'s "argument grammar".

Co-authored-by: Tim Ledbetter <tim.ledbetter@ladybird.org>
This commit is contained in:
Sam Atkins 2025-06-26 17:28:48 +01:00 • committed by Tim Ledbetter
commit b417d13a7b
Notes: github-actions[bot] 2025-07-09 15:45:51 +00:00
2 changed files with 61 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibWeb/CSS/Parser/Parser.h
View file

@ -138,6 +138,12 @@ public:
[[nodiscard]] LengthOrCalculated parse_as_sizes_attribute(DOM::Element const& element, HTML::HTMLImageElement const* img = nullptr); [[nodiscard]] LengthOrCalculated parse_as_sizes_attribute(DOM::Element const& element, HTML::HTMLImageElement const* img = nullptr);
enum class StopAtComma : u8 {
No,
Yes,
};
static Optional<Vector<ComponentValue>> parse_declaration_value(TokenStream<ComponentValue>&, StopAtComma = StopAtComma::No);
private: private:
Parser(ParsingParams const&, Vector<Token>); Parser(ParsingParams const&, Vector<Token>);

55
Libraries/LibWeb/CSS/Parser/ValueParsing.cpp
View file

@ -94,6 +94,61 @@ RefPtr<CSSStyleValue const> Parser::parse_comma_separated_value_list(TokenStream
return StyleValueList::create(move(values), StyleValueList::Separator::Comma); return StyleValueList::create(move(values), StyleValueList::Separator::Comma);
} }
// https://drafts.csswg.org/css-syntax/#typedef-declaration-value
Optional<Vector<ComponentValue>> Parser::parse_declaration_value(TokenStream<ComponentValue>& tokens, StopAtComma stop_at_comma)
{
// The <declaration-value> production matches any sequence of one or more tokens, so long as the sequence does not
// contain <bad-string-token>, <bad-url-token>, unmatched <)-token>, <]-token>, or <}-token>, or top-level
// <semicolon-token> tokens or <delim-token> tokens with a value of "!". It represents the entirety of what a valid
// declaration can have as its value.
auto transaction = tokens.begin_transaction();
Vector<ComponentValue> declaration_value;
while (tokens.has_next_token()) {
auto const& peek = tokens.next_token();
if (!peek.is_token()) {
declaration_value.append(tokens.consume_a_token());
continue;
}
bool valid = true;
switch (peek.token().type()) {
case Token::Type::Invalid:
case Token::Type::EndOfFile:
case Token::Type::BadString:
case Token::Type::BadUrl:
case Token::Type::Semicolon:
// NB: We're dealing with ComponentValues, so all valid function and block-related tokens will already be
// converted to Function or SimpleBlock ComponentValues. Any remaining ones are invalid.
case Token::Type::Function:
case Token::Type::OpenCurly:
case Token::Type::OpenParen:
case Token::Type::OpenSquare:
case Token::Type::CloseCurly:
case Token::Type::CloseParen:
case Token::Type::CloseSquare:
valid = false;
break;
case Token::Type::Delim:
valid = peek.token().delim() != '!';
break;
case Token::Type::Comma:
valid = stop_at_comma == StopAtComma::No;
break;
default:
break;
}
if (!valid)
break;
declaration_value.append(tokens.consume_a_token());
}
if (declaration_value.is_empty())
return OptionalNone {};
transaction.commit();
return declaration_value;
}
Optional<Dimension> Parser::parse_dimension(ComponentValue const& component_value) Optional<Dimension> Parser::parse_dimension(ComponentValue const& component_value)
{ {
if (component_value.is(Token::Type::Dimension)) { if (component_value.is(Token::Type::Dimension)) {