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

LibWeb: Always put a dummy execution context on the main thread VM stack

Browse source 
A lot of code assumes that there's a current execution context. By
setting up a dummy context right after creating the main thread VM,
we ensure that such code can always run.
This commit is contained in:
Andreas Kling 2022-08-04 20:16:40 +02:00
parent 2801ddfa76
commit eca0873245
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp
View file

@ -286,6 +286,12 @@ JS::VM& main_thread_vm()
vm->host_resolve_imported_module = [&](JS::ScriptOrModule, JS::ModuleRequest const&) -> JS::ThrowCompletionOr<NonnullRefPtr<JS::Module>> { vm->host_resolve_imported_module = [&](JS::ScriptOrModule, JS::ModuleRequest const&) -> JS::ThrowCompletionOr<NonnullRefPtr<JS::Module>> {
return vm->throw_completion<JS::InternalError>(vm->current_realm()->global_object(), JS::ErrorType::NotImplemented, "Modules in the browser"); return vm->throw_completion<JS::InternalError>(vm->current_realm()->global_object(), JS::ErrorType::NotImplemented, "Modules in the browser");
}; };
// NOTE: We push a dummy execution context onto the JS execution context stack,
// just to make sure that it's never empty.
auto& custom_data = *verify_cast<WebEngineCustomData>(vm->custom_data());
custom_data.root_execution_context = make<JS::ExecutionContext>(vm->heap());
vm->push_execution_context(*custom_data.root_execution_context);
} }
return *vm; return *vm;
} }

2
Userland/Libraries/LibWeb/Bindings/MainThreadVM.h
View file

@ -29,6 +29,8 @@ struct WebEngineCustomData final : public JS::VM::CustomData {
// https://dom.spec.whatwg.org/#mutation-observer-list // https://dom.spec.whatwg.org/#mutation-observer-list
// FIXME: This should be a set. // FIXME: This should be a set.
NonnullRefPtrVector<DOM::MutationObserver> mutation_observers; NonnullRefPtrVector<DOM::MutationObserver> mutation_observers;
OwnPtr<JS::ExecutionContext> root_execution_context;
}; };
struct WebEngineCustomJobCallbackData final : public JS::JobCallback::CustomData { struct WebEngineCustomJobCallbackData final : public JS::JobCallback::CustomData {