RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 22:08:10 +00:00
Code Issues Activity Actions

LibWeb: Visit CSS block tokens for var() tokens as well

Browse source 
Also extract the equirecursive lambda functions into separate functions
to simplify the code a little bit.
This commit is contained in:
Ali Mohammad Pur 2023-05-26 03:56:02 +03:30 • committed by Andreas Kling
parent 5cd01bd644
commit 49bb04a6ba
1 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -6892,6 +6892,32 @@ ErrorOr<RefPtr<StyleValue>> Parser::parse_grid_template_areas_value(Vector<Compo
return GridTemplateAreaStyleValue::create(grid_area_rows);
}
static bool block_contains_var_or_attr(Block const& block);
static bool function_contains_var_or_attr(Function const& function)
{
if (function.name().equals_ignoring_ascii_case("var"sv) || function.name().equals_ignoring_ascii_case("attr"sv))
return true;
for (auto const& token : function.values()) {
if (token.is_function() && function_contains_var_or_attr(token.function()))
return true;
if (token.is_block() && block_contains_var_or_attr(token.block()))
return true;
}
return false;
}
bool block_contains_var_or_attr(Block const& block)
{
for (auto const& token : block.values()) {
if (token.is_function() && function_contains_var_or_attr(token.function()))
return true;
if (token.is_block() && block_contains_var_or_attr(token.block()))
return true;
}
return false;
};
Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(PropertyID property_id, TokenStream<ComponentValue>& tokens)
{
// FIXME: This is a hack. Until we can reasonably combine the error types, just log the error
@ -6908,25 +6934,6 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
_temporary_result.release_value(); \
})
auto function_contains_var_or_attr = [](Function const& function, auto&& recurse) -> bool {
if (function.name().equals_ignoring_ascii_case("var"sv) || function.name().equals_ignoring_ascii_case("attr"sv))
return true;
for (auto const& token : function.values()) {
if (token.is_function() && recurse(token.function(), recurse))
return true;
}
return false;
};
auto block_contains_var_or_attr = [function_contains_var_or_attr](Block const& block, auto&& recurse) -> bool {
for (auto const& token : block.values()) {
if (token.is_function() && function_contains_var_or_attr(token.function(), function_contains_var_or_attr))
return true;
if (token.is_block() && recurse(token.block(), recurse))
return true;
}
return false;
};
m_context.set_current_property_id(property_id);
Vector<ComponentValue> component_values;
bool contains_var_or_attr = false;
@ -6948,9 +6955,9 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
}
if (!contains_var_or_attr) {
if (token.is_function() && function_contains_var_or_attr(token.function(), function_contains_var_or_attr))
if (token.is_function() && function_contains_var_or_attr(token.function()))
contains_var_or_attr = true;
else if (token.is_block() && block_contains_var_or_attr(token.block(), block_contains_var_or_attr))
else if (token.is_block() && block_contains_var_or_attr(token.block()))
contains_var_or_attr = true;
}