RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:37:35 +00:00
Code Issues Activity Actions

LibWeb: Remove broken CSS:Parser::is_combinator()

Browse source 
A single DELIM token is only one character long, so the check for
a "||" DELIM didn't work. We now just do the check inline.
This commit is contained in:
Sam Atkins 2021-07-02 13:01:38 +01:00 • committed by Andreas Kling
parent 9115c23bd5
commit f9ffa34622
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -318,20 +318,30 @@ Vector<CSS::Selector::ComplexSelector> Parser::parse_selectors(Vector<StyleCompo
auto parse_complex_selector = [&]() -> Optional<CSS::Selector::ComplexSelector> { auto parse_complex_selector = [&]() -> Optional<CSS::Selector::ComplexSelector> {
auto relation = CSS::Selector::ComplexSelector::Relation::Descendant; auto relation = CSS::Selector::ComplexSelector::Relation::Descendant;
if (index >= parts.size())
return {};
auto current_value = parts.at(index); auto current_value = parts.at(index);
if (current_value.is(Token::TokenType::Delim)) { if (current_value.is(Token::TokenType::Delim)) {
auto delim = current_value.token().delim(); auto delim = current_value.token().delim();
if (is_combinator(delim)) { if (delim == ">") {
if (delim == ">") { relation = CSS::Selector::ComplexSelector::Relation::ImmediateChild;
relation = CSS::Selector::ComplexSelector::Relation::ImmediateChild;
} else if (delim == "+") {
relation = CSS::Selector::ComplexSelector::Relation::AdjacentSibling;
} else if (delim == "~") {
relation = CSS::Selector::ComplexSelector::Relation::GeneralSibling;
} else if (delim == "||") {
relation = CSS::Selector::ComplexSelector::Relation::Column;
}
index++; index++;
} else if (delim == "+") {
relation = CSS::Selector::ComplexSelector::Relation::AdjacentSibling;
index++;
} else if (delim == "~") {
relation = CSS::Selector::ComplexSelector::Relation::GeneralSibling;
index++;
} else if (delim == "|") {
if (index + 1 >= parts.size())
return {};
auto next = parts.at(index + 1);
if (next.is(Token::TokenType::Delim) && next.token().delim() == "|") {
relation = CSS::Selector::ComplexSelector::Relation::Column;
index += 2;
}
} }
} }
@ -386,11 +396,6 @@ void Parser::reconsume_current_input_token()
--m_iterator_offset; --m_iterator_offset;
} }
bool Parser::is_combinator(String input)
{
return input == ">" || input == "+" || input == "~" || input == "||";
}
NonnullRefPtrVector<QualifiedStyleRule> Parser::consume_a_list_of_rules(bool top_level) NonnullRefPtrVector<QualifiedStyleRule> Parser::consume_a_list_of_rules(bool top_level)
{ {
NonnullRefPtrVector<QualifiedStyleRule> rules; NonnullRefPtrVector<QualifiedStyleRule> rules;

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

@ -69,7 +69,6 @@ private:
Token peek_token(); Token peek_token();
Token current_token(); Token current_token();
void reconsume_current_input_token(); void reconsume_current_input_token();
bool is_combinator(String);
NonnullRefPtrVector<QualifiedStyleRule> consume_a_list_of_rules(bool top_level); NonnullRefPtrVector<QualifiedStyleRule> consume_a_list_of_rules(bool top_level);
NonnullRefPtr<AtStyleRule> consume_an_at_rule(); NonnullRefPtr<AtStyleRule> consume_an_at_rule();