beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Implement CSS selector parsing entry points

Browse source 
They're still using the same parsing code, so there's a lot of room
for improvement, but it's good for now.
This commit is contained in:
Sam Atkins 2021-07-03 12:34:25 +01:00 committed by Andreas Kling
parent 004ae453d1
commit a6085e19ae
Notes: sideshowbarker 2024-07-18 09:14:24 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/a6085e19aef
Pull-request: https://github.com/SerenityOS/serenity/pull/8341
2 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,27 +97,53 @@ NonnullRefPtr<CSSStyleSheet> Parser::parse_as_stylesheet()
auto parser_rules = consume_a_list_of_rules(true);
NonnullRefPtrVector<CSSRule> rules;
dbgln("Printing rules:");
for (auto& rule : parser_rules) {
dbgln("PRE:");
for (auto& pre : rule.m_prelude) {
dbgln("{}", pre.to_string());
}
dbgln("BLOCK:");
dbgln("{}", rule.block().to_string());
dbgln("");
auto css_rule = convert_rule(rule);
if (css_rule)
rules.append(*css_rule);
for (auto& raw_rule : parser_rules) {
auto rule = convert_rule(raw_rule);
if (rule)
rules.append(*rule);
}
return CSSStyleSheet::create(rules);
}
Vector<CSS::Selector::ComplexSelector> Parser::parse_selectors(Vector<StyleComponentValueRule> parts)
Vector<Selector> Parser::parse_a_selector()
{
auto comma_separated_lists = parse_as_comma_separated_list_of_component_values();
return parse_a_selector(comma_separated_lists);
}
Vector<Selector> Parser::parse_a_selector(Vector<Vector<StyleComponentValueRule>>& parts)
{
Vector<Selector> selectors;
for (auto& selector_parts : parts) {
auto selector = parse_single_selector(selector_parts);
if (selector.has_value())
selectors.append(selector.value());
}
return selectors;
}
Vector<Selector> Parser::parse_a_relative_selector()
{
auto comma_separated_lists = parse_as_comma_separated_list_of_component_values();
Vector<Selector> selectors;
for (auto& selector_parts : comma_separated_lists) {
auto selector = parse_single_selector(selector_parts, true);
if (selector.has_value())
selectors.append(selector.value());
}
return selectors;
}
Optional<Selector> Parser::parse_single_selector(Vector<StyleComponentValueRule> parts, bool is_relative)
{
// FIXME: Bring this all in line with the spec. https://www.w3.org/TR/selectors-4/
Vector<CSS::Selector::ComplexSelector> selectors;
size_t index = 0;
@ -409,9 +435,10 @@ Vector<CSS::Selector::ComplexSelector> Parser::parse_selectors(Vector<StyleCompo
if (selectors.is_empty())
return {};
selectors.first().relation = CSS::Selector::ComplexSelector::Relation::None;
if (!is_relative)
selectors.first().relation = CSS::Selector::ComplexSelector::Relation::None;
return selectors;
return Selector(move(selectors));
}
void Parser::dump_all_tokens()

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

@ -62,11 +62,13 @@ public:
Vector<Vector<StyleComponentValueRule>> parse_as_comma_separated_list_of_component_values();
Vector<CSS::Selector::ComplexSelector> parse_selectors(Vector<StyleComponentValueRule> parts);
Optional<Selector> parse_single_selector(Vector<StyleComponentValueRule> parts, bool is_relative = false);
// FIXME: https://www.w3.org/TR/selectors-4/
Optional<String> parse_a_selector() { return {}; }
Optional<String> parse_a_relative_selector() { return {}; }
// Contrary to the name, these parse a comma-separated list of selectors, according to the spec.
Vector<Selector> parse_a_selector();
Vector<Selector> parse_a_selector(Vector<Vector<StyleComponentValueRule>>&);
Vector<Selector> parse_a_relative_selector();
bool match_a_selector_against_an_element() { return false; }
bool match_a_selector_against_a_pseudo_element() { return false; }
bool match_a_selector_against_a_tree() { return false; }