mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-11 02:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb: Combine shared stylesheet parsing functionality

Browse source 
No functionality changes
This commit is contained in:
Callum Law 2025-06-21 22:43:43 +12:00 • committed by Sam Atkins
commit 5fcf3d0b05
Notes: github-actions[bot] 2025-06-24 11:52:33 +00:00
2 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -103,34 +103,14 @@ Vector<Rule> Parser::parse_a_stylesheets_contents(TokenStream<T>& input)
return consume_a_stylesheets_contents(input); return consume_a_stylesheets_contents(input);
} }
GC::RootVector<GC::Ref<CSSRule>> Parser::parse_as_stylesheet_contents() GC::RootVector<GC::Ref<CSSRule>> Parser::convert_rules(Vector<Rule> const& raw_rules)
{ {
auto raw_rules = parse_a_stylesheets_contents(m_token_stream);
GC::RootVector<GC::Ref<CSSRule>> rules(realm().heap());
for (auto const& raw_rule : raw_rules) {
auto rule = convert_to_rule(raw_rule, Nested::No);
if (!rule) {
log_parse_error();
continue;
}
rules.append(*rule);
}
return rules;
}
// https://drafts.csswg.org/css-syntax/#parse-a-css-stylesheet
GC::Ref<CSS::CSSStyleSheet> Parser::parse_as_css_stylesheet(Optional<::URL::URL> location, Vector<NonnullRefPtr<MediaQuery>> media_query_list)
{
// To parse a CSS stylesheet, first parse a stylesheet.
auto const& style_sheet = parse_a_stylesheet(m_token_stream, location);
bool import_rules_valid = true; bool import_rules_valid = true;
bool namespace_rules_valid = true; bool namespace_rules_valid = true;
// Interpret all of the resulting top-level qualified rules as style rules, defined below. // Interpret all of the resulting top-level qualified rules as style rules, defined below.
GC::RootVector<GC::Ref<CSSRule>> rules(realm().heap()); GC::RootVector<GC::Ref<CSSRule>> rules(realm().heap());
for (auto const& raw_rule : style_sheet.rules) { for (auto const& raw_rule : raw_rules) {
auto rule = convert_to_rule(raw_rule, Nested::No); auto rule = convert_to_rule(raw_rule, Nested::No);
// If any style rule is invalid, or any at-rule is not recognized or is invalid according to its grammar or context, it’s a parse error. // If any style rule is invalid, or any at-rule is not recognized or is invalid according to its grammar or context, it’s a parse error.
// Discard that rule. // Discard that rule.
@ -171,7 +151,21 @@ GC::Ref<CSS::CSSStyleSheet> Parser::parse_as_css_stylesheet(Optional<::URL::URL>
rules.append(*rule); rules.append(*rule);
} }
auto rule_list = CSSRuleList::create(realm(), rules); return rules;
}
GC::RootVector<GC::Ref<CSSRule>> Parser::parse_as_stylesheet_contents()
{
return convert_rules(parse_a_stylesheets_contents(m_token_stream));
}
// https://drafts.csswg.org/css-syntax/#parse-a-css-stylesheet
GC::Ref<CSS::CSSStyleSheet> Parser::parse_as_css_stylesheet(Optional<::URL::URL> location, Vector<NonnullRefPtr<MediaQuery>> media_query_list)
{
// To parse a CSS stylesheet, first parse a stylesheet.
auto const& style_sheet = parse_a_stylesheet(m_token_stream, location);
auto rule_list = CSSRuleList::create(realm(), convert_rules(style_sheet.rules));
auto media_list = MediaList::create(realm(), move(media_query_list)); auto media_list = MediaList::create(realm(), move(media_query_list));
return CSSStyleSheet::create(realm(), rule_list, media_list, move(location)); return CSSStyleSheet::create(realm(), rule_list, media_list, move(location));
} }

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

@ -93,6 +93,7 @@ class Parser {
public: public:
static Parser create(ParsingParams const&, StringView input, StringView encoding = "utf-8"sv); static Parser create(ParsingParams const&, StringView input, StringView encoding = "utf-8"sv);
GC::RootVector<GC::Ref<CSSRule>> convert_rules(Vector<Rule> const& raw_rules);
GC::Ref<CSS::CSSStyleSheet> parse_as_css_stylesheet(Optional<::URL::URL> location, Vector<NonnullRefPtr<MediaQuery>> media_query_list = {}); GC::Ref<CSS::CSSStyleSheet> parse_as_css_stylesheet(Optional<::URL::URL> location, Vector<NonnullRefPtr<MediaQuery>> media_query_list = {});
struct PropertiesAndCustomProperties { struct PropertiesAndCustomProperties {