mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 17:07:35 +00:00
LibWeb: Ignore vendor-prefixed pseudo-element/classes in selectors
Our debug logging when we fail to parse a legitimate selector, is less useful when it's hidden among selectors that don't parse because they contain vendor-prefixed pseudo-elements and classes. So, now we specifically ignore these and don't produce a log message.
This commit is contained in:
parent
83cd2eef8f
commit
13c67f9920
2 changed files with 17 additions and 2 deletions
|
@ -491,6 +491,8 @@ Result<Selector::SimpleSelector, Parser::SelectorParsingResult> Parser::parse_si
|
||||||
}
|
}
|
||||||
|
|
||||||
auto pseudo_name = name_token.token().ident();
|
auto pseudo_name = name_token.token().ident();
|
||||||
|
if (has_ignored_vendor_prefix(pseudo_name))
|
||||||
|
return SelectorParsingResult::IncludesIgnoredVendorPrefix;
|
||||||
|
|
||||||
if (pseudo_name.equals_ignoring_case("after")) {
|
if (pseudo_name.equals_ignoring_case("after")) {
|
||||||
simple_selector.pseudo_element = Selector::SimpleSelector::PseudoElement::After;
|
simple_selector.pseudo_element = Selector::SimpleSelector::PseudoElement::After;
|
||||||
|
@ -518,6 +520,9 @@ Result<Selector::SimpleSelector, Parser::SelectorParsingResult> Parser::parse_si
|
||||||
|
|
||||||
if (pseudo_class_token.is(Token::Type::Ident)) {
|
if (pseudo_class_token.is(Token::Type::Ident)) {
|
||||||
auto pseudo_name = pseudo_class_token.token().ident();
|
auto pseudo_name = pseudo_class_token.token().ident();
|
||||||
|
if (has_ignored_vendor_prefix(pseudo_name))
|
||||||
|
return SelectorParsingResult::IncludesIgnoredVendorPrefix;
|
||||||
|
|
||||||
if (pseudo_name.equals_ignoring_case("active")) {
|
if (pseudo_name.equals_ignoring_case("active")) {
|
||||||
simple_selector.pseudo_class.type = Selector::SimpleSelector::PseudoClass::Type::Active;
|
simple_selector.pseudo_class.type = Selector::SimpleSelector::PseudoClass::Type::Active;
|
||||||
} else if (pseudo_name.equals_ignoring_case("checked")) {
|
} else if (pseudo_name.equals_ignoring_case("checked")) {
|
||||||
|
@ -1223,8 +1228,17 @@ RefPtr<CSSRule> Parser::convert_to_rule(NonnullRefPtr<StyleRule> rule)
|
||||||
} else {
|
} else {
|
||||||
auto prelude_stream = TokenStream(rule->m_prelude);
|
auto prelude_stream = TokenStream(rule->m_prelude);
|
||||||
auto selectors = parse_a_selector(prelude_stream);
|
auto selectors = parse_a_selector(prelude_stream);
|
||||||
if (selectors.is_error() || selectors.value().is_empty()) {
|
|
||||||
dbgln("CSSParser: style rule selectors invalid; discarding.");
|
if (selectors.is_error()) {
|
||||||
|
if (selectors.error() != SelectorParsingResult::IncludesIgnoredVendorPrefix) {
|
||||||
|
dbgln("CSSParser: style rule selectors invalid; discarding.");
|
||||||
|
prelude_stream.dump_all_tokens();
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectors.value().is_empty()) {
|
||||||
|
dbgln("CSSParser: empty selector; discarding.");
|
||||||
prelude_stream.dump_all_tokens();
|
prelude_stream.dump_all_tokens();
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,6 +102,7 @@ public:
|
||||||
private:
|
private:
|
||||||
enum class SelectorParsingResult {
|
enum class SelectorParsingResult {
|
||||||
Done,
|
Done,
|
||||||
|
IncludesIgnoredVendorPrefix,
|
||||||
SyntaxError,
|
SyntaxError,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue