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

LibWeb: Change the IDL type of MessageEvent::data to any

Browse source
This commit is contained in:
Idan Horowitz 2021-10-01 18:21:38 +03:00 • committed by Andreas Kling
parent ded8e84f32
commit b53fc8ad3d
4 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,25 +14,25 @@ class MessageEvent : public DOM::Event {
public: public:
using WrapperType = Bindings::MessageEventWrapper; using WrapperType = Bindings::MessageEventWrapper;
static NonnullRefPtr<MessageEvent> create(const FlyString& event_name, const String& data, const String& origin) static NonnullRefPtr<MessageEvent> create(const FlyString& event_name, JS::Value data, String const& origin)
{ {
return adopt_ref(*new MessageEvent(event_name, data, origin)); return adopt_ref(*new MessageEvent(event_name, data, origin));
} }
virtual ~MessageEvent() override = default; virtual ~MessageEvent() override = default;
const String& data() const { return m_data; } JS::Value data() const { return m_data; }
const String& origin() const { return m_origin; } String const& origin() const { return m_origin; }
protected: protected:
MessageEvent(const FlyString& event_name, const String& data, const String& origin) MessageEvent(const FlyString& event_name, JS::Value data, String origin)
: DOM::Event(event_name) : DOM::Event(event_name)
, m_data(data) , m_data(data)
, m_origin(origin) , m_origin(move(origin))
{ {
} }
String m_data; JS::Value m_data;
String m_origin; String m_origin;
}; };

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

@ -1,7 +1,6 @@
interface MessageEvent : Event { interface MessageEvent : Event {
// FIXME: This should be of type "any" instead of "USVString" readonly attribute any data;
readonly attribute USVString data;
readonly attribute USVString origin; readonly attribute USVString origin;
}; };

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

@ -80,7 +80,7 @@ void MessagePort::post_message(JS::Value message)
// FIXME: This is an ad-hoc hack implementation instead, since we don't currently // FIXME: This is an ad-hoc hack implementation instead, since we don't currently
// have serialization and deserialization of messages. // have serialization and deserialization of messages.
main_thread_event_loop().task_queue().add(HTML::Task::create(HTML::Task::Source::PostedMessage, nullptr, [strong_port = NonnullRefPtr { *target_port }, message]() mutable { main_thread_event_loop().task_queue().add(HTML::Task::create(HTML::Task::Source::PostedMessage, nullptr, [strong_port = NonnullRefPtr { *target_port }, message]() mutable {
strong_port->dispatch_event(MessageEvent::create(HTML::EventNames::message, message.to_string_without_side_effects(), "<origin>")); strong_port->dispatch_event(MessageEvent::create(HTML::EventNames::message, message, "<origin>"));
})); }));
} }

2
Userland/Libraries/LibWeb/HTML/WebSocket.cpp
View file

@ -203,7 +203,7 @@ void WebSocket::on_message(ByteBuffer message, bool is_text)
return; return;
if (is_text) { if (is_text) {
auto text_message = String(ReadonlyBytes(message)); auto text_message = String(ReadonlyBytes(message));
dispatch_event(MessageEvent::create(EventNames::message, text_message, url())); dispatch_event(MessageEvent::create(EventNames::message, JS::js_string(wrapper()->vm(), text_message), url()));
return; return;
} }
// type indicates that the data is Binary and binaryType is "blob" // type indicates that the data is Binary and binaryType is "blob"