RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:28:12 +00:00
Code Issues Activity Actions

LibWeb: Make MessageChannel GC-allocated

Browse source
This commit is contained in:
Andreas Kling 2022-09-01 20:59:51 +02:00
parent 2bba97964b
commit 2ff7e37048
4 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibWeb/Forward.h
View file

@ -467,7 +467,6 @@ class IdleDeadlineWrapper;
class ImageDataWrapper; class ImageDataWrapper;
class IntersectionObserverWrapper; class IntersectionObserverWrapper;
class LocationObject; class LocationObject;
class MessageChannelWrapper;
class OptionConstructor; class OptionConstructor;
class Path2DWrapper; class Path2DWrapper;
class RangePrototype; class RangePrototype;

25
Userland/Libraries/LibWeb/HTML/MessageChannel.cpp
View file

@ -1,22 +1,32 @@
/* /*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2021-2022, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibWeb/Bindings/MessageChannelPrototype.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/MessageChannel.h> #include <LibWeb/HTML/MessageChannel.h>
#include <LibWeb/HTML/MessagePort.h> #include <LibWeb/HTML/MessagePort.h>
#include <LibWeb/HTML/Window.h>
namespace Web::HTML { namespace Web::HTML {
MessageChannel::MessageChannel(HTML::Window& window) JS::NonnullGCPtr<MessageChannel> MessageChannel::create_with_global_object(HTML::Window& window)
{ {
return *window.heap().allocate<MessageChannel>(window.realm(), window);
}
MessageChannel::MessageChannel(HTML::Window& window)
: PlatformObject(window.realm())
{
set_prototype(&window.ensure_web_prototype<Bindings::MessageChannelPrototype>("MessageChannel"));
// 1. Set this's port 1 to a new MessagePort in this's relevant Realm. // 1. Set this's port 1 to a new MessagePort in this's relevant Realm.
m_port1 = JS::make_handle(*MessagePort::create(window)); m_port1 = MessagePort::create(window);
// 2. Set this's port 2 to a new MessagePort in this's relevant Realm. // 2. Set this's port 2 to a new MessagePort in this's relevant Realm.
m_port2 = JS::make_handle(*MessagePort::create(window)); m_port2 = MessagePort::create(window);
// 3. Entangle this's port 1 and this's port 2. // 3. Entangle this's port 1 and this's port 2.
m_port1->entangle_with(*m_port2); m_port1->entangle_with(*m_port2);
@ -24,6 +34,13 @@ MessageChannel::MessageChannel(HTML::Window& window)
MessageChannel::~MessageChannel() = default; MessageChannel::~MessageChannel() = default;
void MessageChannel::visit_edges(Cell::Visitor& visitor)
{
Base::visit_edges(visitor);
visitor.visit(m_port1.ptr());
visitor.visit(m_port2.ptr());
}
MessagePort* MessageChannel::port1() MessagePort* MessageChannel::port1()
{ {
return m_port1; return m_port1;

32
Userland/Libraries/LibWeb/HTML/MessageChannel.h
View file

@ -1,34 +1,22 @@
/* /*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2021-2022, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#pragma once #pragma once
#include <AK/RefCounted.h> #include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Bindings/Wrappable.h>
#include <LibWeb/DOM/EventTarget.h>
#include <LibWeb/Forward.h> #include <LibWeb/Forward.h>
#include <LibWeb/HTML/Window.h>
namespace Web::HTML { namespace Web::HTML {
// https://html.spec.whatwg.org/multipage/web-messaging.html#message-channels // https://html.spec.whatwg.org/multipage/web-messaging.html#message-channels
class MessageChannel final class MessageChannel final : public Bindings::PlatformObject {
: public RefCounted<MessageChannel> WEB_PLATFORM_OBJECT(MessageChannel, Bindings::PlatformObject);
, public Bindings::Wrappable {
public: public:
using WrapperType = Bindings::MessageChannelWrapper; static JS::NonnullGCPtr<MessageChannel> create_with_global_object(HTML::Window&);
using RefCounted::ref;
using RefCounted::unref;
static NonnullRefPtr<MessageChannel> create_with_global_object(HTML::Window& window)
{
return adopt_ref(*new MessageChannel(window));
}
virtual ~MessageChannel() override; virtual ~MessageChannel() override;
MessagePort* port1(); MessagePort* port1();
@ -40,8 +28,12 @@ public:
private: private:
explicit MessageChannel(HTML::Window&); explicit MessageChannel(HTML::Window&);
JS::Handle<MessagePort> m_port1; virtual void visit_edges(Cell::Visitor&) override;
JS::Handle<MessagePort> m_port2;
JS::GCPtr<MessagePort> m_port1;
JS::GCPtr<MessagePort> m_port2;
}; };
} }
WRAPPER_HACK(MessageChannel, Web::HTML)

2
Userland/Libraries/LibWeb/idl_files.cmake
View file

@ -141,7 +141,7 @@ libweb_js_wrapper(HTML/HTMLUListElement NO_INSTANCE)
libweb_js_wrapper(HTML/HTMLUnknownElement NO_INSTANCE) libweb_js_wrapper(HTML/HTMLUnknownElement NO_INSTANCE)
libweb_js_wrapper(HTML/HTMLVideoElement NO_INSTANCE) libweb_js_wrapper(HTML/HTMLVideoElement NO_INSTANCE)
libweb_js_wrapper(HTML/ImageData) libweb_js_wrapper(HTML/ImageData)
libweb_js_wrapper(HTML/MessageChannel) libweb_js_wrapper(HTML/MessageChannel NO_INSTANCE)
libweb_js_wrapper(HTML/MessageEvent NO_INSTANCE) libweb_js_wrapper(HTML/MessageEvent NO_INSTANCE)
libweb_js_wrapper(HTML/MessagePort NO_INSTANCE) libweb_js_wrapper(HTML/MessagePort NO_INSTANCE)
libweb_js_wrapper(HTML/PageTransitionEvent NO_INSTANCE) libweb_js_wrapper(HTML/PageTransitionEvent NO_INSTANCE)