Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-08 06:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Allow reset-only longhands in coordinating value list shorthands

Browse source 
Required for `animation-timeline` and the various `animation-trigger-*`
properties within the `animation` coordinating value list
This commit is contained in:
Callum Law 2025-11-23 17:35:13 +13:00 • committed by Sam Atkins
parent 6bb7224f4e
commit d79aba68d2
Notes: github-actions[bot] 2025-11-28 13:25:46 +00:00
3 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,7 @@ RefPtr<StyleValue const> Parser::parse_simple_comma_separated_value_list(Propert
});
}
RefPtr<StyleValue const> Parser::parse_coordinating_value_list_shorthand(TokenStream<ComponentValue>& tokens, PropertyID shorthand_id, Vector<PropertyID> const& longhand_ids)
RefPtr<StyleValue const> Parser::parse_coordinating_value_list_shorthand(TokenStream<ComponentValue>& tokens, PropertyID shorthand_id, Vector<PropertyID> const& longhand_ids, Vector<PropertyID> const& reset_only_longhand_ids = {})
{
HashMap<PropertyID, StyleValueVector> longhand_vectors;
@ -144,23 +144,25 @@ RefPtr<StyleValue const> Parser::parse_coordinating_value_list_shorthand(TokenSt
transaction.commit();
Vector<PropertyID> longhand_ids_including_reset_only_longhands;
longhand_ids_including_reset_only_longhands.extend(longhand_ids);
longhand_ids_including_reset_only_longhands.extend(reset_only_longhand_ids);
StyleValueVector longhand_values {};
// FIXME: This is for compatibility with parse_comma_separated_value_list(), which returns a single value directly
// instead of a list if there's only one, it would be nicer if we always returned a list.
if (longhand_vectors.get(longhand_ids[0])->size() == 1) {
StyleValueVector longhand_values {};
for (auto const& longhand_id : longhand_ids)
longhand_values.append((*longhand_vectors.get(longhand_id))[0]);
return ShorthandStyleValue::create(shorthand_id, longhand_ids, longhand_values);
} else {
for (auto const& longhand_id : longhand_ids)
longhand_values.append(StyleValueList::create(move(*longhand_vectors.get(longhand_id)), StyleValueList::Separator::Comma));
}
StyleValueVector longhand_values {};
for (auto reset_only_longhand_id : reset_only_longhand_ids)
longhand_values.append(property_initial_value(reset_only_longhand_id));
for (auto const& longhand_id : longhand_ids)
longhand_values.append(StyleValueList::create(move(*longhand_vectors.get(longhand_id)), StyleValueList::Separator::Comma));
return ShorthandStyleValue::create(shorthand_id, longhand_ids, longhand_values);
return ShorthandStyleValue::create(shorthand_id, longhand_ids_including_reset_only_longhands, longhand_values);
}
RefPtr<StyleValue const> Parser::parse_css_value_for_property(PropertyID property_id, TokenStream<ComponentValue>& tokens)