RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-29 00:57:36 +00:00
Code Issues Activity Actions

LibJS: Pass Realm to GlobalObject::initialize_global_object()

Browse source 
Global object initialization is tightly coupled to realm creation, so
simply pass it to the function instead of relying on the non-standard
'associated realm' concept, which I'd like to remove later.

This works essentially the same way as regular Object::initialize() now.

Additionally this allows us to forward the realm to GlobalObject's
add_constructor() / initialize_constructor() helpers, so they set the
correct realm on the allocated constructor function object.
This commit is contained in:
Linus Groh 2022-08-22 18:56:16 +01:00
parent b465f46e00
commit 7c468b5a77
18 changed files with 76 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Services/WebContent/ConsoleGlobalObject.cpp
View file

@ -20,9 +20,9 @@ ConsoleGlobalObject::ConsoleGlobalObject(JS::Realm& realm, Web::Bindings::Window
{
}
void ConsoleGlobalObject::initialize_global_object()
void ConsoleGlobalObject::initialize_global_object(JS::Realm& realm)
{
Base::initialize_global_object();
Base::initialize_global_object(realm);
// $0 magic variable
define_native_accessor("$0", inspected_node_getter, nullptr, 0);

2
Userland/Services/WebContent/ConsoleGlobalObject.h
View file

@ -35,7 +35,7 @@ public:
virtual JS::ThrowCompletionOr<bool> internal_delete(JS::PropertyKey const& name) override;
virtual JS::ThrowCompletionOr<JS::MarkedVector<JS::Value>> internal_own_property_keys() const override;
virtual void initialize_global_object() override;
virtual void initialize_global_object(JS::Realm&) override;
private:
virtual void visit_edges(Visitor&) override;

7
Userland/Services/WebContent/WebContentConsoleClient.cpp
View file

@ -24,7 +24,8 @@ WebContentConsoleClient::WebContentConsoleClient(JS::Console& console, WeakPtr<J
JS::DeferGC defer_gc(m_interpreter->heap());
auto& vm = m_interpreter->vm();
auto& global_object = m_interpreter->global_object();
auto& realm = m_interpreter->realm();
auto& global_object = realm.global_object();
auto console_global_object = m_interpreter->heap().allocate_without_realm<ConsoleGlobalObject>(m_interpreter->realm(), static_cast<Web::Bindings::WindowObject&>(global_object));
@ -32,8 +33,8 @@ WebContentConsoleClient::WebContentConsoleClient(JS::Console& console, WeakPtr<J
// It gets removed immediately after creating the interpreter in Document::interpreter().
auto& eso = verify_cast<Web::HTML::EnvironmentSettingsObject>(*m_interpreter->realm().host_defined());
vm.push_execution_context(eso.realm_execution_context());
console_global_object->set_associated_realm(m_interpreter->realm());
console_global_object->initialize_global_object();
console_global_object->set_associated_realm(realm);
console_global_object->initialize_global_object(realm);
vm.pop_execution_context();
m_console_global_object = JS::make_handle(console_global_object);