beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb: Use Selectors instead of a String for :not() selectors

Browse source 
Rather than parsing the selector every time we want to check it, we
now parse it once at the beginning.

A bonus effect of this is that we now support a selector list in
:not(), instead of just a single selector, though only when using
the new parser.
This commit is contained in:
Sam Atkins 2021-07-12 17:58:47 +01:00 committed by Andreas Kling
parent 776b1f4548
commit ffc81cbfad
Notes: sideshowbarker 2024-07-18 09:04:11 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/ffc81cbfad8
Pull-request: https://github.com/SerenityOS/serenity/pull/8723
Reviewed-by: https://github.com/kleinesfilmroellchen
8 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Base/res/html/misc/not-selector.html Normal file
View file

@ -0,0 +1,20 @@
<html>
<head>
<title>:only-child test</title>
<style>
div {
background: yellow;
}
div:not(div div) {
background: lime;
}
</style>
</head>
<body>
<div>I am not a descendant and should be green.</div>
<div>
<div>I am a descendant and should be yellow.</div>
</div>
</body>
</html>

1
Base/res/html/misc/welcome.html
View file

@ -109,6 +109,7 @@
<li><a href="nth-last-child.html">:nth-last-child</a></li>
<li><a href="empty.html">:empty</a></li>
<li><a href="root.html">:root</a></li>
<li><a href="not-selector.html">:not</a></li>
<li><a href="form.html">form</a></li>
<li><a href="borders.html">borders</a></li>
<li><a href="css.html">css</a></li>

6
Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp
View file

@ -606,7 +606,11 @@ public:
pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Checked;
} else if (pseudo_name.starts_with("not", CaseSensitivity::CaseInsensitive)) {
pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Not;
pseudo_class.not_selector = capture_selector_args(pseudo_name);
auto not_selector = Web::parse_selector(m_context, capture_selector_args(pseudo_name));
if (not_selector) {
pseudo_class.not_selector.clear();
pseudo_class.not_selector.append(not_selector.release_nonnull());
}
} else {
dbgln("Unknown pseudo class: '{}'", pseudo_name);
return {};

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

@ -469,7 +469,8 @@ RefPtr<Selector> Parser::parse_single_selector(TokenStream<T>& tokens, bool is_r
}
} else if (pseudo_function.name().equals_ignoring_case("not")) {
pseudo_class.type = Selector::SimpleSelector::PseudoClass::Type::Not;
pseudo_class.not_selector = pseudo_function.values_as_string();
auto function_token_stream = TokenStream(pseudo_function.values());
pseudo_class.not_selector = parse_a_selector(function_token_stream);
} else {
dbgln("Unknown pseudo class: '{}'()", pseudo_function.name());
return {};

5
Userland/Libraries/LibWeb/CSS/Parser/StyleFunctionRule.h
View file

@ -24,11 +24,6 @@ public:
String const& name() const { return m_name; }
Vector<StyleComponentValueRule> const& values() const { return m_values; }
// FIXME: This method is a temporary hack while much of the parser still expects a string, rather than tokens.
String values_as_string() const
{
return "";
}
String to_string() const;

4
Userland/Libraries/LibWeb/CSS/Selector.h
View file

@ -8,6 +8,7 @@
#pragma once
#include <AK/FlyString.h>
#include <AK/NonnullRefPtrVector.h>
#include <AK/RefCounted.h>
#include <AK/String.h>
#include <AK/Vector.h>
@ -64,8 +65,7 @@ public:
// Only used when "pseudo_class" is "NthChild" or "NthLastChild".
NthChildPattern nth_child_pattern;
// FIXME: This wants to be a Selector, rather than parsing it each time it is used.
String not_selector {};
NonnullRefPtrVector<Selector> not_selector {};
};
PseudoClass pseudo_class;

15
Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp
View file

@ -113,15 +113,12 @@ static bool matches_pseudo_class(CSS::Selector::SimpleSelector::PseudoClass cons
if (!element.has_attribute("checked"))
return false;
return true;
case CSS::Selector::SimpleSelector::PseudoClass::Type::Not: {
if (pseudo_class.not_selector.is_empty())
return false;
auto not_selector = Web::parse_selector(CSS::DeprecatedParsingContext(element), pseudo_class.not_selector);
if (!not_selector)
return false;
auto not_matches = matches(not_selector.release_nonnull(), element);
return !not_matches;
}
case CSS::Selector::SimpleSelector::PseudoClass::Type::Not:
for (auto& selector : pseudo_class.not_selector) {
if (matches(selector, element))
return false;
}
return true;
case CSS::Selector::SimpleSelector::PseudoClass::Type::NthChild:
case CSS::Selector::SimpleSelector::PseudoClass::Type::NthLastChild:
auto const step_size = pseudo_class.nth_child_pattern.step_size;

5
Userland/Libraries/LibWeb/Dump.cpp
View file

@ -393,7 +393,10 @@ void dump_selector(StringBuilder& builder, CSS::Selector const& selector)
builder.appendff(" pseudo_class={}", pseudo_class_description);
if (pseudo_class.type == CSS::Selector::SimpleSelector::PseudoClass::Type::Not) {
builder.appendff("({})", pseudo_class.not_selector);
builder.append("(");
for (auto& selector : pseudo_class.not_selector)
dump_selector(builder, selector);
builder.append(")");
} else if ((pseudo_class.type == CSS::Selector::SimpleSelector::PseudoClass::Type::NthChild)
|| (pseudo_class.type == CSS::Selector::SimpleSelector::PseudoClass::Type::NthLastChild)) {
builder.appendff("(step={}, offset={})", pseudo_class.nth_child_pattern.step_size, pseudo_class.nth_child_pattern.offset);