RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:47:45 +00:00
Code Issues Activity Actions

LibWeb+LibJS: Make the EventTarget hierarchy (incl. DOM) GC-allocated

Browse source 
This is a monster patch that turns all EventTargets into GC-allocated
PlatformObjects. Their C++ wrapper classes are removed, and the LibJS
garbage collector is now responsible for their lifetimes.

There's a fair amount of hacks and band-aids in this patch, and we'll
have a lot of cleanup to do after this.
This commit is contained in:
Andreas Kling 2022-08-28 13:42:07 +02:00
parent bb547ce1c4
commit 6f433c8656
445 changed files with 4797 additions and 4268 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/Libraries/LibWeb/Layout/Node.cpp
View file

@ -600,4 +600,29 @@ RefPtr<Painting::Paintable> Node::create_paintable() const
return nullptr;
}
bool Node::is_anonymous() const
{
return !m_dom_node.ptr();
}
DOM::Node const* Node::dom_node() const
{
return m_dom_node.ptr();
}
DOM::Node* Node::dom_node()
{
return m_dom_node.ptr();
}
DOM::Document& Node::document()
{
return *m_document;
}
DOM::Document const& Node::document() const
{
return *m_document;
}
}

15
Userland/Libraries/LibWeb/Layout/Node.h
View file

@ -10,6 +10,7 @@
#include <AK/TypeCasts.h>
#include <AK/Vector.h>
#include <LibGfx/Rect.h>
#include <LibJS/Heap/Handle.h>
#include <LibWeb/CSS/ComputedValues.h>
#include <LibWeb/CSS/StyleProperties.h>
#include <LibWeb/Forward.h>
@ -37,9 +38,9 @@ public:
size_t serial_id() const { return m_serial_id; }
bool is_anonymous() const { return !m_dom_node; }
const DOM::Node* dom_node() const { return m_dom_node; }
DOM::Node* dom_node() { return m_dom_node; }
bool is_anonymous() const;
DOM::Node const* dom_node() const;
DOM::Node* dom_node();
Painting::Paintable* paintable() { return m_paintable; }
Painting::Paintable const* paintable() const { return m_paintable; }
@ -47,8 +48,8 @@ public:
virtual RefPtr<Painting::Paintable> create_paintable() const;
DOM::Document& document() { return m_document; }
const DOM::Document& document() const { return m_document; }
DOM::Document& document();
DOM::Document const& document() const;
HTML::BrowsingContext const& browsing_context() const;
HTML::BrowsingContext& browsing_context();
@ -140,8 +141,8 @@ protected:
private:
friend class NodeWithStyle;
NonnullRefPtr<DOM::Document> m_document;
RefPtr<DOM::Node> m_dom_node;
JS::Handle<DOM::Document> m_document;
JS::Handle<DOM::Node> m_dom_node;
RefPtr<Painting::Paintable> m_paintable;
size_t m_serial_id { 0 };

10
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
View file

@ -219,15 +219,15 @@ void TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context&
if (auto pseudo_element_node = DOM::Element::create_layout_node_for_display_type(document, pseudo_element_display, move(pseudo_element_style), nullptr)) {
// FIXME: Handle images, and multiple values
if (pseudo_element_content.type == CSS::ContentData::Type::String) {
auto text = adopt_ref(*new DOM::Text(document, pseudo_element_content.data));
auto text_node = adopt_ref(*new TextNode(document, text));
auto* text = document.heap().allocate<DOM::Text>(document.realm(), document, pseudo_element_content.data);
auto text_node = adopt_ref(*new TextNode(document, *text));
push_parent(verify_cast<NodeWithStyle>(*pseudo_element_node));
insert_node_into_inline_or_block_ancestor(text_node);
pop_parent();
} else {
TODO();
}
return pseudo_element_node;
return pseudo_element_node.ptr();
}
return nullptr;
@ -235,11 +235,11 @@ void TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context&
push_parent(verify_cast<NodeWithStyle>(*layout_node));
if (auto before_node = create_pseudo_element_if_needed(CSS::Selector::PseudoElement::Before)) {
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::Before, before_node);
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::Before, before_node.ptr());
insert_node_into_inline_or_block_ancestor(before_node, true);
}
if (auto after_node = create_pseudo_element_if_needed(CSS::Selector::PseudoElement::After)) {
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::After, after_node);
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::After, after_node.ptr());
insert_node_into_inline_or_block_ancestor(after_node);
}
pop_parent();