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

LibWeb: Port MessageEvent to new String

Browse source
This commit is contained in:
Kenneth Myhra 2023-03-05 10:33:56 +01:00 • committed by Linus Groh
parent 84997ab0ee
commit eed69e5093
8 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1298,7 +1298,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<Event>> Document::create_event(DeprecatedSt
} else if (Infra::is_ascii_case_insensitive_match(interface, "keyboardevent"sv)) { } else if (Infra::is_ascii_case_insensitive_match(interface, "keyboardevent"sv)) {
event = TRY(UIEvents::KeyboardEvent::create(realm, "")); event = TRY(UIEvents::KeyboardEvent::create(realm, ""));
} else if (Infra::is_ascii_case_insensitive_match(interface, "messageevent"sv)) { } else if (Infra::is_ascii_case_insensitive_match(interface, "messageevent"sv)) {
event = TRY(HTML::MessageEvent::create(realm, "")); event = TRY(HTML::MessageEvent::create(realm, String {}));
} else if (Infra::is_ascii_case_insensitive_match(interface, "mouseevent"sv) } else if (Infra::is_ascii_case_insensitive_match(interface, "mouseevent"sv)
|| Infra::is_ascii_case_insensitive_match(interface, "mouseevents"sv)) { || Infra::is_ascii_case_insensitive_match(interface, "mouseevents"sv)) {
event = TRY(UIEvents::MouseEvent::create(realm, "")); event = TRY(UIEvents::MouseEvent::create(realm, ""));

8
Userland/Libraries/LibWeb/HTML/MessageEvent.cpp
View file

@ -9,18 +9,18 @@
namespace Web::HTML { namespace Web::HTML {
WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> MessageEvent::create(JS::Realm& realm, DeprecatedFlyString const& event_name, MessageEventInit const& event_init) WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> MessageEvent::create(JS::Realm& realm, FlyString const& event_name, MessageEventInit const& event_init)
{ {
return MUST_OR_THROW_OOM(realm.heap().allocate<MessageEvent>(realm, realm, event_name, event_init)); return MUST_OR_THROW_OOM(realm.heap().allocate<MessageEvent>(realm, realm, event_name, event_init));
} }
WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> MessageEvent::construct_impl(JS::Realm& realm, DeprecatedFlyString const& event_name, MessageEventInit const& event_init) WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> MessageEvent::construct_impl(JS::Realm& realm, FlyString const& event_name, MessageEventInit const& event_init)
{ {
return create(realm, event_name, event_init); return create(realm, event_name, event_init);
} }
MessageEvent::MessageEvent(JS::Realm& realm, DeprecatedFlyString const& event_name, MessageEventInit const& event_init) MessageEvent::MessageEvent(JS::Realm& realm, FlyString const& event_name, MessageEventInit const& event_init)
: DOM::Event(realm, event_name, event_init) : DOM::Event(realm, event_name.to_deprecated_fly_string(), event_init)
, m_data(event_init.data) , m_data(event_init.data)
, m_origin(event_init.origin) , m_origin(event_init.origin)
, m_last_event_id(event_init.last_event_id) , m_last_event_id(event_init.last_event_id)

19
Userland/Libraries/LibWeb/HTML/MessageEvent.h
View file

@ -7,37 +7,38 @@
#pragma once #pragma once
#include <AK/FlyString.h>
#include <LibWeb/DOM/Event.h> #include <LibWeb/DOM/Event.h>
namespace Web::HTML { namespace Web::HTML {
struct MessageEventInit : public DOM::EventInit { struct MessageEventInit : public DOM::EventInit {
JS::Value data { JS::js_null() }; JS::Value data { JS::js_null() };
DeprecatedString origin { "" }; String origin;
DeprecatedString last_event_id { "" }; String last_event_id;
}; };
class MessageEvent : public DOM::Event { class MessageEvent : public DOM::Event {
WEB_PLATFORM_OBJECT(MessageEvent, DOM::Event); WEB_PLATFORM_OBJECT(MessageEvent, DOM::Event);
public: public:
static WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> create(JS::Realm&, DeprecatedFlyString const& event_name, MessageEventInit const& event_init = {}); static WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> create(JS::Realm&, FlyString const& event_name, MessageEventInit const& event_init = {});
static WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> construct_impl(JS::Realm&, DeprecatedFlyString const& event_name, MessageEventInit const& event_init); static WebIDL::ExceptionOr<JS::NonnullGCPtr<MessageEvent>> construct_impl(JS::Realm&, FlyString const& event_name, MessageEventInit const& event_init);
MessageEvent(JS::Realm&, DeprecatedFlyString const& event_name, MessageEventInit const& event_init); MessageEvent(JS::Realm&, FlyString const& event_name, MessageEventInit const& event_init);
virtual ~MessageEvent() override; virtual ~MessageEvent() override;
JS::Value data() const { return m_data; } JS::Value data() const { return m_data; }
DeprecatedString const& origin() const { return m_origin; } String const& origin() const { return m_origin; }
DeprecatedString const& last_event_id() const { return m_last_event_id; } String const& last_event_id() const { return m_last_event_id; }
private: private:
virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override; virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override;
virtual void visit_edges(Cell::Visitor&) override; virtual void visit_edges(Cell::Visitor&) override;
JS::Value m_data; JS::Value m_data;
DeprecatedString m_origin; String m_origin;
DeprecatedString m_last_event_id; String m_last_event_id;
}; };
} }

2
Userland/Libraries/LibWeb/HTML/MessageEvent.idl
View file

@ -1,7 +1,7 @@
#import <DOM/Event.idl> #import <DOM/Event.idl>
// https://html.spec.whatwg.org/multipage/comms.html#messageevent // https://html.spec.whatwg.org/multipage/comms.html#messageevent
[Exposed=(Window,Worker)] [Exposed=(Window,Worker), UseNewAKString]
interface MessageEvent : Event { interface MessageEvent : Event {
constructor(DOMString type, optional MessageEventInit eventInitDict = {}); constructor(DOMString type, optional MessageEventInit eventInitDict = {});

4
Userland/Libraries/LibWeb/HTML/MessagePort.cpp
View file

@ -98,8 +98,8 @@ void MessagePort::post_message(JS::Value message)
main_thread_event_loop().task_queue().add(HTML::Task::create(HTML::Task::Source::PostedMessage, nullptr, [target_port, message] { main_thread_event_loop().task_queue().add(HTML::Task::create(HTML::Task::Source::PostedMessage, nullptr, [target_port, message] {
MessageEventInit event_init {}; MessageEventInit event_init {};
event_init.data = message; event_init.data = message;
event_init.origin = "<origin>"; event_init.origin = "<origin>"_string.release_value_but_fixme_should_propagate_errors();
target_port->dispatch_event(MessageEvent::create(target_port->realm(), HTML::EventNames::message, event_init).release_value_but_fixme_should_propagate_errors()); target_port->dispatch_event(MessageEvent::create(target_port->realm(), String::from_deprecated_string(HTML::EventNames::message).release_value_but_fixme_should_propagate_errors(), event_init).release_value_but_fixme_should_propagate_errors());
})); }));
} }

4
Userland/Libraries/LibWeb/HTML/Window.cpp
View file

@ -916,8 +916,8 @@ WebIDL::ExceptionOr<void> Window::post_message_impl(JS::Value message, Deprecate
HTML::queue_global_task(HTML::Task::Source::PostedMessage, *this, [this, message] { HTML::queue_global_task(HTML::Task::Source::PostedMessage, *this, [this, message] {
HTML::MessageEventInit event_init {}; HTML::MessageEventInit event_init {};
event_init.data = message; event_init.data = message;
event_init.origin = "<origin>"; event_init.origin = "<origin>"_string.release_value_but_fixme_should_propagate_errors();
dispatch_event(HTML::MessageEvent::create(realm(), HTML::EventNames::message, event_init).release_value_but_fixme_should_propagate_errors()); dispatch_event(HTML::MessageEvent::create(realm(), String::from_deprecated_string(HTML::EventNames::message).release_value_but_fixme_should_propagate_errors(), event_init).release_value_but_fixme_should_propagate_errors());
}); });
return {}; return {};
} }

4
Userland/Libraries/LibWeb/HTML/Worker.cpp
View file

@ -165,8 +165,8 @@ void Worker::run_a_worker(AK::URL& url, EnvironmentSettingsObject& outside_setti
event_loop.task_queue().add(HTML::Task::create(HTML::Task::Source::PostedMessage, nullptr, [this, message] { event_loop.task_queue().add(HTML::Task::create(HTML::Task::Source::PostedMessage, nullptr, [this, message] {
MessageEventInit event_init {}; MessageEventInit event_init {};
event_init.data = message; event_init.data = message;
event_init.origin = "<origin>"; event_init.origin = "<origin>"_string.release_value_but_fixme_should_propagate_errors();
dispatch_event(MessageEvent::create(*m_worker_realm, HTML::EventNames::message, event_init).release_value_but_fixme_should_propagate_errors()); dispatch_event(MessageEvent::create(*m_worker_realm, String::from_deprecated_string(HTML::EventNames::message).release_value_but_fixme_should_propagate_errors(), event_init).release_value_but_fixme_should_propagate_errors());
})); }));
return JS::js_undefined(); return JS::js_undefined();

8
Userland/Libraries/LibWeb/WebSockets/WebSocket.cpp
View file

@ -234,8 +234,8 @@ void WebSocket::on_message(ByteBuffer message, bool is_text)
auto text_message = DeprecatedString(ReadonlyBytes(message)); auto text_message = DeprecatedString(ReadonlyBytes(message));
HTML::MessageEventInit event_init; HTML::MessageEventInit event_init;
event_init.data = JS::PrimitiveString::create(vm(), text_message); event_init.data = JS::PrimitiveString::create(vm(), text_message);
event_init.origin = url(); event_init.origin = String::from_deprecated_string(url()).release_value_but_fixme_should_propagate_errors();
dispatch_event(HTML::MessageEvent::create(realm(), HTML::EventNames::message, event_init).release_value_but_fixme_should_propagate_errors()); dispatch_event(HTML::MessageEvent::create(realm(), String::from_deprecated_string(HTML::EventNames::message).release_value_but_fixme_should_propagate_errors(), event_init).release_value_but_fixme_should_propagate_errors());
return; return;
} }
@ -246,8 +246,8 @@ void WebSocket::on_message(ByteBuffer message, bool is_text)
// type indicates that the data is Binary and binaryType is "arraybuffer" // type indicates that the data is Binary and binaryType is "arraybuffer"
HTML::MessageEventInit event_init; HTML::MessageEventInit event_init;
event_init.data = JS::ArrayBuffer::create(realm(), message); event_init.data = JS::ArrayBuffer::create(realm(), message);
event_init.origin = url(); event_init.origin = String::from_deprecated_string(url()).release_value_but_fixme_should_propagate_errors();
dispatch_event(HTML::MessageEvent::create(realm(), HTML::EventNames::message, event_init).release_value_but_fixme_should_propagate_errors()); dispatch_event(HTML::MessageEvent::create(realm(), String::from_deprecated_string(HTML::EventNames::message).release_value_but_fixme_should_propagate_errors(), event_init).release_value_but_fixme_should_propagate_errors());
return; return;
} }