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

LibWeb: Hook on_call_stack_emptied after m_interpreter was initialized

Browse source 
We must hook `on_call_stack_emptied` after the interpreter was created,
as the initialization of the WindowsObject can invoke some internal
calls, which will eventually lead to this hook being called without
`m_interpreter` being fully initialized yet.
This commit is contained in:
Idan Horowitz 2021-07-04 12:10:27 +03:00 • committed by Andreas Kling
parent d73f53d1de
commit 2f60508ae0
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -625,6 +625,11 @@ JS::Interpreter& Document::interpreter()
{ {
if (!m_interpreter) { if (!m_interpreter) {
auto& vm = Bindings::main_thread_vm(); auto& vm = Bindings::main_thread_vm();
m_interpreter = JS::Interpreter::create<Bindings::WindowObject>(vm, *m_window);
// NOTE: We must hook `on_call_stack_emptied` after the interpreter was created, as the initialization of the
// WindowsObject can invoke some internal calls, which will eventually lead to this hook being called without
// `m_interpreter` being fully initialized yet.
// TODO: Hook up vm.on_promise_unhandled_rejection and vm.on_promise_rejection_handled // TODO: Hook up vm.on_promise_unhandled_rejection and vm.on_promise_rejection_handled
// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises#promise_rejection_events // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises#promise_rejection_events
vm.on_call_stack_emptied = [this] { vm.on_call_stack_emptied = [this] {
@ -659,7 +664,6 @@ JS::Interpreter& Document::interpreter()
vm.finish_execution_generation(); vm.finish_execution_generation();
}; };
m_interpreter = JS::Interpreter::create<Bindings::WindowObject>(vm, *m_window);
} }
return *m_interpreter; return *m_interpreter;
} }