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

LibHTML: Update CSS parser with terminology from Selectors Level 4

Browse source
This commit is contained in:
Andreas Kling 2019-11-28 07:18:19 +01:00
parent 75ed262fe5
commit a42e477002
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Libraries/LibHTML/Parser/CSSParser.cpp
View file

@ -202,7 +202,7 @@ public:
return ch == '~' || ch == '>' || ch == '+'; return ch == '~' || ch == '>' || ch == '+';
} }
Optional<Selector::SimpleSelector> parse_selector_component() Optional<Selector::SimpleSelector> parse_simple_selector()
{ {
if (consume_whitespace_or_comments()) if (consume_whitespace_or_comments())
return {}; return {};
@ -243,7 +243,7 @@ public:
PARSE_ASSERT(!buffer.is_null()); PARSE_ASSERT(!buffer.is_null());
} }
Selector::SimpleSelector component { Selector::SimpleSelector simple_selector {
type, type,
Selector::SimpleSelector::PseudoClass::None, Selector::SimpleSelector::PseudoClass::None,
String::copy(buffer), String::copy(buffer),
@ -284,9 +284,9 @@ public:
else else
attribute_name = String::copy(buffer); attribute_name = String::copy(buffer);
buffer.clear(); buffer.clear();
component.attribute_match_type = attribute_match_type; simple_selector.attribute_match_type = attribute_match_type;
component.attribute_name = attribute_name; simple_selector.attribute_name = attribute_name;
component.attribute_value = attribute_value; simple_selector.attribute_value = attribute_value;
if (expected_end_of_attribute_selector != ']') if (expected_end_of_attribute_selector != ']')
consume_specific(expected_end_of_attribute_selector); consume_specific(expected_end_of_attribute_selector);
consume_whitespace_or_comments(); consume_whitespace_or_comments();
@ -308,15 +308,15 @@ public:
buffer.clear(); buffer.clear();
if (pseudo_name == "link") if (pseudo_name == "link")
component.pseudo_class = Selector::SimpleSelector::PseudoClass::Link; simple_selector.pseudo_class = Selector::SimpleSelector::PseudoClass::Link;
else if (pseudo_name == "hover") else if (pseudo_name == "hover")
component.pseudo_class = Selector::SimpleSelector::PseudoClass::Hover; simple_selector.pseudo_class = Selector::SimpleSelector::PseudoClass::Hover;
} }
return component; return simple_selector;
} }
Optional<Selector::ComplexSelector> parse_selector_component_list() Optional<Selector::ComplexSelector> parse_complex_selector()
{ {
auto relation = Selector::ComplexSelector::Relation::Descendant; auto relation = Selector::ComplexSelector::Relation::Descendant;
@ -341,37 +341,37 @@ public:
consume_whitespace_or_comments(); consume_whitespace_or_comments();
Vector<Selector::SimpleSelector> components; Vector<Selector::SimpleSelector> simple_selectors;
for (;;) { for (;;) {
dbg() << "calling parse_selector_component at index " << index << ", peek=" << peek(); auto component = parse_simple_selector();
auto component = parse_selector_component();
if (!component.has_value()) if (!component.has_value())
break; break;
components.append(component.value()); simple_selectors.append(component.value());
PARSE_ASSERT(components.size() < 10); // If this assert triggers, we're most likely up to no good.
PARSE_ASSERT(simple_selectors.size() < 100);
} }
return Selector::ComplexSelector { relation, move(components) }; return Selector::ComplexSelector { relation, move(simple_selectors) };
} }
void parse_selector() void parse_selector()
{ {
Vector<Selector::ComplexSelector> component_lists; Vector<Selector::ComplexSelector> complex_selectors;
for (;;) { for (;;) {
auto component_list = parse_selector_component_list(); auto complex_selector = parse_complex_selector();
if (component_list.has_value()) if (complex_selector.has_value())
component_lists.append(component_list.value()); complex_selectors.append(complex_selector.value());
consume_whitespace_or_comments(); consume_whitespace_or_comments();
if (peek() == ',' || peek() == '{') if (peek() == ',' || peek() == '{')
break; break;
} }
if (component_lists.is_empty()) if (complex_selectors.is_empty())
return; return;
component_lists.first().relation = Selector::ComplexSelector::Relation::None; complex_selectors.first().relation = Selector::ComplexSelector::Relation::None;
current_rule.selectors.append(Selector(move(component_lists))); current_rule.selectors.append(Selector(move(complex_selectors)));
}; };
void parse_selector_list() void parse_selector_list()