beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb: Bring "parse a list of declarations" closer to spec

Browse source 
The work to create a PropertyOwningCSSStyleDeclaration is now moved to
convert_to_style_declaration() instead.
This commit is contained in:
Sam Atkins 2022-03-28 16:37:54 +01:00 committed by Andreas Kling
parent da1a819858
commit 1dcde57922
Notes: sideshowbarker 2024-07-17 16:37:07 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/1dcde57922
Pull-request: https://github.com/SerenityOS/serenity/pull/13318
2 changed files with 51 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1902,39 +1902,20 @@ Optional<StyleProperty> Parser::parse_a_declaration(TokenStream<T>& tokens)
return {}; return {};
} }
RefPtr<PropertyOwningCSSStyleDeclaration> Parser::parse_as_list_of_declarations() Vector<DeclarationOrAtRule> Parser::parse_as_list_of_declarations()
{ {
return parse_a_list_of_declarations(m_token_stream); return parse_a_list_of_declarations(m_token_stream);
} }
// 5.3.8. Parse a list of declarations
// https://www.w3.org/TR/css-syntax-3/#parse-list-of-declarations
template<typename T> template<typename T>
RefPtr<PropertyOwningCSSStyleDeclaration> Parser::parse_a_list_of_declarations(TokenStream<T>& tokens) Vector<DeclarationOrAtRule> Parser::parse_a_list_of_declarations(TokenStream<T>& tokens)
{ {
auto declarations_and_at_rules = consume_a_list_of_declarations(tokens); // To parse a list of declarations from input:
// 1. Normalize input, and set input to the result.
Vector<StyleProperty> properties; // 2. Consume a list of declarations from input, and return the result.
HashMap<String, StyleProperty> custom_properties; return consume_a_list_of_declarations(tokens);
for (auto& declaration_or_at_rule : declarations_and_at_rules) {
if (declaration_or_at_rule.is_at_rule()) {
dbgln_if(CSS_PARSER_DEBUG, "!!! CSS at-rule is not allowed here!");
continue;
}
auto& declaration = declaration_or_at_rule.m_declaration;
auto maybe_property = convert_to_style_property(declaration);
if (maybe_property.has_value()) {
auto property = maybe_property.value();
if (property.property_id == PropertyID::Custom) {
custom_properties.set(property.custom_name, property);
} else {
properties.append(property);
}
}
}
return PropertyOwningCSSStyleDeclaration::create(move(properties), move(custom_properties));
} }
Optional<StyleComponentValueRule> Parser::parse_as_component_value() Optional<StyleComponentValueRule> Parser::parse_as_component_value()
@ -2015,6 +1996,12 @@ Vector<Vector<StyleComponentValueRule>> Parser::parse_a_comma_separated_list_of_
return lists; return lists;
} }
RefPtr<PropertyOwningCSSStyleDeclaration> Parser::parse_as_style_attribute()
{
auto declarations_and_at_rules = parse_a_list_of_declarations(m_token_stream);
return convert_to_style_declaration(declarations_and_at_rules);
}
Optional<AK::URL> Parser::parse_url_function(StyleComponentValueRule const& component_value, AllowedDataUrlType allowed_data_url_type) Optional<AK::URL> Parser::parse_url_function(StyleComponentValueRule const& component_value, AllowedDataUrlType allowed_data_url_type)
{ {
// FIXME: Handle list of media queries. https://www.w3.org/TR/css-cascade-3/#conditional-import // FIXME: Handle list of media queries. https://www.w3.org/TR/css-cascade-3/#conditional-import
@ -2156,7 +2143,13 @@ RefPtr<CSSRule> Parser::convert_to_rule(NonnullRefPtr<StyleRule> rule)
return {}; return {};
} }
auto declaration = convert_to_declaration(*rule->m_block); if (!rule->block()->is_curly())
return {};
auto stream = TokenStream(rule->block()->values());
auto declarations_and_at_rules = parse_a_list_of_declarations(stream);
auto declaration = convert_to_style_declaration(declarations_and_at_rules);
if (!declaration) { if (!declaration) {
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: style rule declaration invalid; discarding."); dbgln_if(CSS_PARSER_DEBUG, "CSSParser: style rule declaration invalid; discarding.");
return {}; return {};
@ -2168,13 +2161,31 @@ RefPtr<CSSRule> Parser::convert_to_rule(NonnullRefPtr<StyleRule> rule)
return {}; return {};
} }
RefPtr<PropertyOwningCSSStyleDeclaration> Parser::convert_to_declaration(NonnullRefPtr<StyleBlockRule> block) RefPtr<PropertyOwningCSSStyleDeclaration> Parser::convert_to_style_declaration(Vector<DeclarationOrAtRule> declarations_and_at_rules)
{ {
if (!block->is_curly()) Vector<StyleProperty> properties;
return {}; HashMap<String, StyleProperty> custom_properties;
auto stream = TokenStream(block->m_values); for (auto& declaration_or_at_rule : declarations_and_at_rules) {
return parse_a_list_of_declarations(stream); if (declaration_or_at_rule.is_at_rule()) {
dbgln_if(CSS_PARSER_DEBUG, "!!! CSS at-rule is not allowed here!");
continue;
}
auto& declaration = declaration_or_at_rule.m_declaration;
auto maybe_property = convert_to_style_property(declaration);
if (maybe_property.has_value()) {
auto property = maybe_property.value();
if (property.property_id == PropertyID::Custom) {
custom_properties.set(property.custom_name, property);
} else {
properties.append(property);
}
}
}
return PropertyOwningCSSStyleDeclaration::create(move(properties), move(custom_properties));
} }
Optional<StyleProperty> Parser::convert_to_style_property(StyleDeclarationRule const& declaration) Optional<StyleProperty> Parser::convert_to_style_property(StyleDeclarationRule const& declaration)
@ -5086,10 +5097,11 @@ RefPtr<CSS::CSSStyleSheet> parse_css(CSS::ParsingContext const& context, StringV
RefPtr<CSS::PropertyOwningCSSStyleDeclaration> parse_css_style_attribute(CSS::ParsingContext const& context, StringView css) RefPtr<CSS::PropertyOwningCSSStyleDeclaration> parse_css_style_attribute(CSS::ParsingContext const& context, StringView css)
{ {
// FIXME: We could save some effort by creating an ElementInlineCSSStyleDeclaration right here.
if (css.is_empty()) if (css.is_empty())
return CSS::PropertyOwningCSSStyleDeclaration::create({}, {}); return CSS::PropertyOwningCSSStyleDeclaration::create({}, {});
CSS::Parser parser(context, css); CSS::Parser parser(context, css);
return parser.parse_as_list_of_declarations(); return parser.parse_as_style_attribute();
} }
RefPtr<CSS::StyleValue> parse_css_value(CSS::ParsingContext const& context, StringView string, CSS::PropertyID property_id) RefPtr<CSS::StyleValue> parse_css_value(CSS::ParsingContext const& context, StringView string, CSS::PropertyID property_id)

8
Userland/Libraries/LibWeb/CSS/Parser/Parser.h
View file

@ -98,13 +98,15 @@ public:
// Used in @supports conditions. [CSS3-CONDITIONAL] // Used in @supports conditions. [CSS3-CONDITIONAL]
Optional<StyleProperty> parse_as_declaration(); Optional<StyleProperty> parse_as_declaration();
// For the contents of a style attribute, which parses text into the contents of a single style rule. // For the contents of a style attribute, which parses text into the contents of a single style rule.
RefPtr<PropertyOwningCSSStyleDeclaration> parse_as_list_of_declarations(); Vector<DeclarationOrAtRule> parse_as_list_of_declarations();
// For things that need to consume a single value, like the parsing rules for attr(). // For things that need to consume a single value, like the parsing rules for attr().
Optional<StyleComponentValueRule> parse_as_component_value(); Optional<StyleComponentValueRule> parse_as_component_value();
// For the contents of presentational attributes, which parse text into a single declaration’s value, or for parsing a stand-alone selector [SELECT] or list of Media Queries [MEDIAQ], as in Selectors API or the media HTML attribute. // For the contents of presentational attributes, which parse text into a single declaration’s value, or for parsing a stand-alone selector [SELECT] or list of Media Queries [MEDIAQ], as in Selectors API or the media HTML attribute.
Vector<StyleComponentValueRule> parse_as_list_of_component_values(); Vector<StyleComponentValueRule> parse_as_list_of_component_values();
Vector<Vector<StyleComponentValueRule>> parse_as_comma_separated_list_of_component_values(); Vector<Vector<StyleComponentValueRule>> parse_as_comma_separated_list_of_component_values();
RefPtr<PropertyOwningCSSStyleDeclaration> parse_as_style_attribute();
enum class SelectorParsingMode { enum class SelectorParsingMode {
Standard, Standard,
// `<forgiving-selector-list>` and `<forgiving-relative-selector-list>` // `<forgiving-selector-list>` and `<forgiving-relative-selector-list>`
@ -141,7 +143,7 @@ private:
template<typename T> template<typename T>
Optional<StyleProperty> parse_a_declaration(TokenStream<T>&); Optional<StyleProperty> parse_a_declaration(TokenStream<T>&);
template<typename T> template<typename T>
RefPtr<PropertyOwningCSSStyleDeclaration> parse_a_list_of_declarations(TokenStream<T>&); Vector<DeclarationOrAtRule> parse_a_list_of_declarations(TokenStream<T>&);
template<typename T> template<typename T>
Optional<StyleComponentValueRule> parse_a_component_value(TokenStream<T>&); Optional<StyleComponentValueRule> parse_a_component_value(TokenStream<T>&);
template<typename T> template<typename T>
@ -187,7 +189,7 @@ private:
[[nodiscard]] Optional<GeneralEnclosed> parse_general_enclosed(TokenStream<StyleComponentValueRule>&); [[nodiscard]] Optional<GeneralEnclosed> parse_general_enclosed(TokenStream<StyleComponentValueRule>&);
[[nodiscard]] RefPtr<CSSRule> convert_to_rule(NonnullRefPtr<StyleRule>); [[nodiscard]] RefPtr<CSSRule> convert_to_rule(NonnullRefPtr<StyleRule>);
[[nodiscard]] RefPtr<PropertyOwningCSSStyleDeclaration> convert_to_declaration(NonnullRefPtr<StyleBlockRule>); [[nodiscard]] RefPtr<PropertyOwningCSSStyleDeclaration> convert_to_style_declaration(Vector<DeclarationOrAtRule> declarations);
[[nodiscard]] Optional<StyleProperty> convert_to_style_property(StyleDeclarationRule const&); [[nodiscard]] Optional<StyleProperty> convert_to_style_property(StyleDeclarationRule const&);
class Dimension { class Dimension {