RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

LibWeb: Make LiveNodeList faster when it only cares about children

Browse source 
Same optimization as HTMLCollection, ported to LiveNodeList.
This commit is contained in:
Andreas Kling 2023-05-23 12:28:16 +02:00
parent fe92b54137
commit fa25f70086
3 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibWeb/DOM/LiveNodeList.cpp
View file

@ -10,15 +10,16 @@
namespace Web::DOM { namespace Web::DOM {
WebIDL::ExceptionOr<JS::NonnullGCPtr<NodeList>> LiveNodeList::create(JS::Realm& realm, Node& root, Function<bool(Node const&)> filter) WebIDL::ExceptionOr<JS::NonnullGCPtr<NodeList>> LiveNodeList::create(JS::Realm& realm, Node& root, Scope scope, Function<bool(Node const&)> filter)
{ {
return MUST_OR_THROW_OOM(realm.heap().allocate<LiveNodeList>(realm, realm, root, move(filter))); return MUST_OR_THROW_OOM(realm.heap().allocate<LiveNodeList>(realm, realm, root, scope, move(filter)));
} }
LiveNodeList::LiveNodeList(JS::Realm& realm, Node& root, Function<bool(Node const&)> filter) LiveNodeList::LiveNodeList(JS::Realm& realm, Node& root, Scope scope, Function<bool(Node const&)> filter)
: NodeList(realm) : NodeList(realm)
, m_root(root) , m_root(root)
, m_filter(move(filter)) , m_filter(move(filter))
, m_scope(scope)
{ {
} }
@ -33,12 +34,19 @@ void LiveNodeList::visit_edges(Cell::Visitor& visitor)
JS::MarkedVector<Node*> LiveNodeList::collection() const JS::MarkedVector<Node*> LiveNodeList::collection() const
{ {
JS::MarkedVector<Node*> nodes(heap()); JS::MarkedVector<Node*> nodes(heap());
m_root->for_each_in_inclusive_subtree([&](auto& node) { if (m_scope == Scope::Descendants) {
if (m_filter(node)) m_root->for_each_in_subtree([&](auto& node) {
nodes.append(const_cast<Node*>(&node)); if (m_filter(node))
nodes.append(const_cast<Node*>(&node));
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
} else {
m_root->for_each_child([&](auto& node) {
if (m_filter(node))
nodes.append(const_cast<Node*>(&node));
return IterationDecision::Continue;
});
}
return nodes; return nodes;
} }

10
Userland/Libraries/LibWeb/DOM/LiveNodeList.h
View file

@ -18,7 +18,12 @@ class LiveNodeList final : public NodeList {
WEB_PLATFORM_OBJECT(LiveNodeList, NodeList); WEB_PLATFORM_OBJECT(LiveNodeList, NodeList);
public: public:
static WebIDL::ExceptionOr<JS::NonnullGCPtr<NodeList>> create(JS::Realm&, Node& root, Function<bool(Node const&)> filter); enum class Scope {
Children,
Descendants,
};
static WebIDL::ExceptionOr<JS::NonnullGCPtr<NodeList>> create(JS::Realm&, Node& root, Scope, Function<bool(Node const&)> filter);
virtual ~LiveNodeList() override; virtual ~LiveNodeList() override;
virtual u32 length() const override; virtual u32 length() const override;
@ -27,7 +32,7 @@ public:
virtual bool is_supported_property_index(u32) const override; virtual bool is_supported_property_index(u32) const override;
private: private:
LiveNodeList(JS::Realm&, Node& root, Function<bool(Node const&)> filter); LiveNodeList(JS::Realm&, Node& root, Scope, Function<bool(Node const&)> filter);
virtual void visit_edges(Cell::Visitor&) override; virtual void visit_edges(Cell::Visitor&) override;
@ -35,6 +40,7 @@ private:
JS::NonnullGCPtr<Node> m_root; JS::NonnullGCPtr<Node> m_root;
Function<bool(Node const&)> m_filter; Function<bool(Node const&)> m_filter;
Scope m_scope { Scope::Descendants };
}; };
} }

4
Userland/Libraries/LibWeb/DOM/Node.cpp
View file

@ -932,8 +932,8 @@ Element* Node::parent_or_shadow_host_element()
JS::NonnullGCPtr<NodeList> Node::child_nodes() JS::NonnullGCPtr<NodeList> Node::child_nodes()
{ {
if (!m_child_nodes) { if (!m_child_nodes) {
m_child_nodes = LiveNodeList::create(realm(), *this, [this](auto& node) { m_child_nodes = LiveNodeList::create(realm(), *this, LiveNodeList::Scope::Children, [](auto&) {
return is_parent_of(node); return true;
}).release_value_but_fixme_should_propagate_errors(); }).release_value_but_fixme_should_propagate_errors();
} }
return *m_child_nodes; return *m_child_nodes;