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

Ladybird: Update for LibJS global object construction changes

Browse source
This commit is contained in:
Andreas Kling 2022-08-05 11:23:46 +02:00 • committed by Andrew Kaster
parent b1cc1bd47b
commit 90c0ae5e63
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ladybird/ConsoleClient.cpp
View file

@ -28,12 +28,13 @@ ConsoleClient::ConsoleClient(JS::Console& console, WeakPtr<JS::Interpreter> inte
auto& vm = m_interpreter->vm(); auto& vm = m_interpreter->vm();
auto& global_object = m_interpreter->global_object(); auto& global_object = m_interpreter->global_object();
auto console_global_object = m_interpreter->heap().allocate_without_global_object<ConsoleGlobalObject>(static_cast<Web::Bindings::WindowObject&>(global_object)); auto console_global_object = m_interpreter->heap().allocate_without_global_object<ConsoleGlobalObject>(*global_object.associated_realm(), static_cast<Web::Bindings::WindowObject&>(global_object));
// NOTE: We need to push an execution context here for NativeFunction::create() to succeed during global object initialization. // NOTE: We need to push an execution context here for NativeFunction::create() to succeed during global object initialization.
// It gets removed immediately after creating the interpreter in Document::interpreter(). // It gets removed immediately after creating the interpreter in Document::interpreter().
auto& eso = verify_cast<Web::HTML::EnvironmentSettingsObject>(*m_interpreter->realm().host_defined()); auto& eso = verify_cast<Web::HTML::EnvironmentSettingsObject>(*m_interpreter->realm().host_defined());
vm.push_execution_context(eso.realm_execution_context()); 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->initialize_global_object();
vm.pop_execution_context(); vm.pop_execution_context();

5
Ladybird/ConsoleGlobalObject.cpp
View file

@ -15,8 +15,9 @@
namespace Ladybird { namespace Ladybird {
ConsoleGlobalObject::ConsoleGlobalObject(Web::Bindings::WindowObject& parent_object) ConsoleGlobalObject::ConsoleGlobalObject(JS::Realm& realm, Web::Bindings::WindowObject& parent_object)
: m_window_object(&parent_object) : JS::GlobalObject(realm)
, m_window_object(&parent_object)
{ {
} }

2
Ladybird/ConsoleGlobalObject.h
View file

@ -23,7 +23,7 @@ class ConsoleGlobalObject final : public JS::GlobalObject {
JS_OBJECT(ConsoleGlobalObject, JS::GlobalObject); JS_OBJECT(ConsoleGlobalObject, JS::GlobalObject);
public: public:
ConsoleGlobalObject(Web::Bindings::WindowObject&); ConsoleGlobalObject(JS::Realm&, Web::Bindings::WindowObject&);
virtual ~ConsoleGlobalObject() override = default; virtual ~ConsoleGlobalObject() override = default;
virtual JS::ThrowCompletionOr<Object*> internal_get_prototype_of() const override; virtual JS::ThrowCompletionOr<Object*> internal_get_prototype_of() const override;