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

LibWeb: Give the DOM Window object a (weak) pointer to its JS wrapper

Browse source
This commit is contained in:
Andreas Kling 2020-06-20 17:45:27 +02:00
parent 8194dfb9f4
commit cc5cba90db
4 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Libraries/LibWeb/Bindings/WindowObject.cpp
View file

@ -45,6 +45,7 @@ namespace Bindings {
WindowObject::WindowObject(Window& impl) WindowObject::WindowObject(Window& impl)
: m_impl(impl) : m_impl(impl)
{ {
impl.set_wrapper({}, *this);
} }
void WindowObject::initialize() void WindowObject::initialize()

5
Libraries/LibWeb/Bindings/WindowObject.h
View file

@ -26,13 +26,16 @@
#pragma once #pragma once
#include <AK/Weakable.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
#include <LibWeb/Forward.h> #include <LibWeb/Forward.h>
namespace Web { namespace Web {
namespace Bindings { namespace Bindings {
class WindowObject final : public JS::GlobalObject { class WindowObject final
: public JS::GlobalObject
, public Weakable<WindowObject> {
public: public:
explicit WindowObject(Window&); explicit WindowObject(Window&);
virtual void initialize() override; virtual void initialize() override;

15
Libraries/LibWeb/DOM/Window.cpp
View file

@ -51,6 +51,11 @@ Window::~Window()
{ {
} }
void Window::set_wrapper(Badge<Bindings::WindowObject>, Bindings::WindowObject& wrapper)
{
m_wrapper = wrapper.make_weak_ptr();
}
void Window::alert(const String& message) void Window::alert(const String& message)
{ {
GUI::MessageBox::show(message, "Alert", GUI::MessageBox::Type::Information); GUI::MessageBox::show(message, "Alert", GUI::MessageBox::Type::Information);
@ -65,22 +70,20 @@ bool Window::confirm(const String& message)
void Window::set_interval(JS::Function& callback, i32 interval) void Window::set_interval(JS::Function& callback, i32 interval)
{ {
// FIXME: This leaks the interval timer and makes it unstoppable. // FIXME: This leaks the interval timer and makes it unstoppable.
(void)Core::Timer::construct(interval, [handle = make_handle(&callback)] { (void)Core::Timer::construct(interval, [this, handle = make_handle(&callback)] {
auto& function = const_cast<JS::Function&>(static_cast<const JS::Function&>(*handle.cell())); auto& function = const_cast<JS::Function&>(static_cast<const JS::Function&>(*handle.cell()));
auto& interpreter = function.interpreter(); auto& interpreter = function.interpreter();
auto& window = static_cast<Bindings::WindowObject&>(interpreter.global_object()); interpreter.call(function, wrapper());
interpreter.call(function, &window);
}).leak_ref(); }).leak_ref();
} }
void Window::set_timeout(JS::Function& callback, i32 interval) void Window::set_timeout(JS::Function& callback, i32 interval)
{ {
// FIXME: This leaks the interval timer and makes it unstoppable. // FIXME: This leaks the interval timer and makes it unstoppable.
auto& timer = Core::Timer::construct(interval, [handle = make_handle(&callback)] { auto& timer = Core::Timer::construct(interval, [this, handle = make_handle(&callback)] {
auto& function = const_cast<JS::Function&>(static_cast<const JS::Function&>(*handle.cell())); auto& function = const_cast<JS::Function&>(static_cast<const JS::Function&>(*handle.cell()));
auto& interpreter = function.interpreter(); auto& interpreter = function.interpreter();
auto& window = static_cast<Bindings::WindowObject&>(interpreter.global_object()); interpreter.call(function, wrapper());
interpreter.call(function, &window);
}).leak_ref(); }).leak_ref();
timer.set_single_shot(true); timer.set_single_shot(true);
} }

6
Libraries/LibWeb/DOM/Window.h
View file

@ -52,10 +52,16 @@ public:
void did_set_location_href(Badge<Bindings::LocationObject>, const String& new_href); void did_set_location_href(Badge<Bindings::LocationObject>, const String& new_href);
void did_call_location_reload(Badge<Bindings::LocationObject>); void did_call_location_reload(Badge<Bindings::LocationObject>);
Bindings::WindowObject* wrapper() { return m_wrapper; }
const Bindings::WindowObject* wrapper() const { return m_wrapper; }
void set_wrapper(Badge<Bindings::WindowObject>, Bindings::WindowObject&);
private: private:
explicit Window(Document&); explicit Window(Document&);
Document& m_document; Document& m_document;
WeakPtr<Bindings::WindowObject> m_wrapper;
}; };
} }