RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:18:11 +00:00
Code Issues Activity Actions

LibWeb+LibJS: Let JS::Realm::HostDefined objects mark things during GC

Browse source 
This allows us to mark the HTML::Window from our window environment
settings object.
This commit is contained in:
Andreas Kling 2022-09-01 21:22:02 +02:00
parent 2ff7e37048
commit abfb73f2e7
4 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibJS/Runtime/Realm.cpp
View file

@ -115,9 +115,12 @@ void Realm::set_global_object(Object* global_object, Object* this_value)
void Realm::visit_edges(Visitor& visitor) void Realm::visit_edges(Visitor& visitor)
{ {
Base::visit_edges(visitor);
visitor.visit(m_intrinsics); visitor.visit(m_intrinsics);
visitor.visit(m_global_object); visitor.visit(m_global_object);
visitor.visit(m_global_environment); visitor.visit(m_global_environment);
if (m_host_defined)
m_host_defined->visit_edges(visitor);
} }
} }

2
Userland/Libraries/LibJS/Runtime/Realm.h
View file

@ -25,6 +25,8 @@ class Realm final
public: public:
struct HostDefined { struct HostDefined {
virtual ~HostDefined() = default; virtual ~HostDefined() = default;
virtual void visit_edges(Cell::Visitor&) { }
}; };
static Realm* create(VM&); static Realm* create(VM&);

8
Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp
View file

@ -16,6 +16,14 @@ WindowEnvironmentSettingsObject::WindowEnvironmentSettingsObject(Window& window,
{ {
} }
WindowEnvironmentSettingsObject::~WindowEnvironmentSettingsObject() = default;
void WindowEnvironmentSettingsObject::visit_edges(JS::Cell::Visitor& visitor)
{
EnvironmentSettingsObject::visit_edges(visitor);
visitor.visit(m_window.ptr());
}
// https://html.spec.whatwg.org/multipage/window-object.html#set-up-a-window-environment-settings-object // https://html.spec.whatwg.org/multipage/window-object.html#set-up-a-window-environment-settings-object
void WindowEnvironmentSettingsObject::setup(AK::URL const& creation_url, NonnullOwnPtr<JS::ExecutionContext> execution_context, Optional<Environment> reserved_environment, AK::URL top_level_creation_url, Origin top_level_origin) void WindowEnvironmentSettingsObject::setup(AK::URL const& creation_url, NonnullOwnPtr<JS::ExecutionContext> execution_context, Optional<Environment> reserved_environment, AK::URL top_level_creation_url, Origin top_level_origin)
{ {

8
Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h
View file

@ -6,8 +6,8 @@
#pragma once #pragma once
#include <LibJS/Heap/Cell.h>
#include <LibWeb/HTML/Scripting/Environments.h> #include <LibWeb/HTML/Scripting/Environments.h>
#include <LibWeb/HTML/Window.h>
namespace Web::HTML { namespace Web::HTML {
@ -15,7 +15,7 @@ class WindowEnvironmentSettingsObject final : public EnvironmentSettingsObject {
public: public:
static void setup(AK::URL const& creation_url, NonnullOwnPtr<JS::ExecutionContext>, Optional<Environment>, AK::URL top_level_creation_url, Origin top_level_origin); static void setup(AK::URL const& creation_url, NonnullOwnPtr<JS::ExecutionContext>, Optional<Environment>, AK::URL top_level_creation_url, Origin top_level_origin);
virtual ~WindowEnvironmentSettingsObject() override = default; virtual ~WindowEnvironmentSettingsObject() override;
virtual JS::GCPtr<DOM::Document> responsible_document() override; virtual JS::GCPtr<DOM::Document> responsible_document() override;
virtual String api_url_character_encoding() override; virtual String api_url_character_encoding() override;
@ -26,7 +26,9 @@ public:
private: private:
WindowEnvironmentSettingsObject(Window&, NonnullOwnPtr<JS::ExecutionContext>); WindowEnvironmentSettingsObject(Window&, NonnullOwnPtr<JS::ExecutionContext>);
WeakPtr<Window> m_window; virtual void visit_edges(JS::Cell::Visitor&) override;
JS::GCPtr<Window> m_window;
}; };
} }