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

LibWeb: Give HTML::EventLoop a pointer to the JS::VM

Browse source 
This will be required for event loop processing.
This commit is contained in:
Andreas Kling 2021-09-09 00:27:06 +02:00
parent 7bcde2bcfb
commit e0c7f8dafa
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,10 @@ namespace Web::Bindings {
JS::VM& main_thread_vm() JS::VM& main_thread_vm()
{ {
static RefPtr<JS::VM> vm; static RefPtr<JS::VM> vm;
if (!vm) if (!vm) {
vm = JS::VM::create(make<WebEngineCustomData>()); vm = JS::VM::create(make<WebEngineCustomData>());
static_cast<WebEngineCustomData*>(vm->custom_data())->event_loop.set_vm(*vm);
}
return *vm; return *vm;
} }

6
Userland/Libraries/LibWeb/HTML/EventLoop/EventLoop.cpp
View file

@ -18,6 +18,12 @@ EventLoop::~EventLoop()
{ {
} }
void EventLoop::set_vm(JS::VM& vm)
{
VERIFY(!m_vm);
m_vm = &vm;
}
EventLoop& main_thread_event_loop() EventLoop& main_thread_event_loop()
{ {
return static_cast<Bindings::WebEngineCustomData*>(Bindings::main_thread_vm().custom_data())->event_loop; return static_cast<Bindings::WebEngineCustomData*>(Bindings::main_thread_vm().custom_data())->event_loop;

7
Userland/Libraries/LibWeb/HTML/EventLoop/EventLoop.h
View file

@ -35,6 +35,11 @@ public:
Task const* currently_running_task() const { return m_currently_running_task; } Task const* currently_running_task() const { return m_currently_running_task; }
JS::VM& vm() { return *m_vm; }
JS::VM const& vm() const { return *m_vm; }
void set_vm(JS::VM&);
private: private:
Type m_type { Type::Window }; Type m_type { Type::Window };
@ -42,6 +47,8 @@ private:
// https://html.spec.whatwg.org/multipage/webappapis.html#currently-running-task // https://html.spec.whatwg.org/multipage/webappapis.html#currently-running-task
Task* m_currently_running_task { nullptr }; Task* m_currently_running_task { nullptr };
JS::VM* m_vm { nullptr };
}; };
EventLoop& main_thread_event_loop(); EventLoop& main_thread_event_loop();