mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-10-16 04:59:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Parse the container-type property

Browse source 
This applies size, inline-size, and style containment in some cases.
There are other WPT tests for that, but we seem to not implement enough
of containment for this to have an effect so I've not imported those.

Gets us 35 WPT subtests.
This commit is contained in:
Sam Atkins 2025-09-30 14:48:55 +01:00 • committed by Tim Ledbetter
commit 3916e33276
Notes: github-actions[bot] 2025-09-30 21:07:12 +00:00
17 changed files with 355 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Libraries/LibWeb/CSS/Parser/PropertyParsing.cpp
View file

@ -537,6 +537,14 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue const>> Parser::parse_css_value(Pr
if (auto parsed_value = parse_columns_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
return ParseError::SyntaxError;
case PropertyID::Contain:
if (auto parsed_value = parse_contain_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
return ParseError::SyntaxError;
case PropertyID::ContainerType:
if (auto parsed_value = parse_container_type_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
return ParseError::SyntaxError;
case PropertyID::Content:
if (auto parsed_value = parse_content_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
@ -815,10 +823,6 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue const>> Parser::parse_css_value(Pr
if (auto parsed_value = parse_scale_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
return ParseError::SyntaxError;
case PropertyID::Contain:
if (auto parsed_value = parse_contain_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
return ParseError::SyntaxError;
case PropertyID::WhiteSpace:
if (auto parsed_value = parse_white_space_shorthand(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
@ -6073,6 +6077,59 @@ RefPtr<StyleValue const> Parser::parse_contain_value(TokenStream<ComponentValue>
return StyleValueList::create(move(containment_values), StyleValueList::Separator::Space);
}
// https://drafts.csswg.org/css-conditional-5/#propdef-container-type
RefPtr<StyleValue const> Parser::parse_container_type_value(TokenStream<ComponentValue>& tokens)
{
// normal | [ [ size | inline-size ] || scroll-state ]
auto transaction = tokens.begin_transaction();
tokens.discard_whitespace();
// normal
if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::Normal)) {
transaction.commit();
return none;
}
// [ [ size | inline-size ] || scroll-state ]
if (!tokens.has_next_token())
return {};
RefPtr<StyleValue const> size_value;
RefPtr<StyleValue const> scroll_state_value;
while (tokens.has_next_token()) {
auto keyword_value = parse_keyword_value(tokens);
if (!keyword_value)
return {};
switch (keyword_value->to_keyword()) {
case Keyword::Size:
case Keyword::InlineSize:
if (size_value)
return {};
size_value = move(keyword_value);
break;
case Keyword::ScrollState:
if (scroll_state_value)
return {};
scroll_state_value = move(keyword_value);
break;
default:
return {};
}
tokens.discard_whitespace();
}
StyleValueVector containment_values;
if (size_value)
containment_values.append(size_value.release_nonnull());
if (scroll_state_value)
containment_values.append(scroll_state_value.release_nonnull());
transaction.commit();
return StyleValueList::create(move(containment_values), StyleValueList::Separator::Space);
}
// https://www.w3.org/TR/css-text-4/#white-space-trim
RefPtr<StyleValue const> Parser::parse_white_space_trim_value(TokenStream<ComponentValue>& tokens)
{