From 473bebc9a8844d77b1424a799a93e06e06fd6148 Mon Sep 17 00:00:00 2001
From: Shannon Booth <shannon@serenityos.org>
Date: Sat, 23 Nov 2024 16:26:03 +1300
Subject: [PATCH] LibWeb: Tidy up return types of BroadcastChannel

Use GC::Ptr over a raw pointer and make the name() function const
qualfied returning a reference instead of a copy.
---
 Libraries/LibWeb/HTML/BroadcastChannel.cpp | 15 ++++-----------
 Libraries/LibWeb/HTML/BroadcastChannel.h   | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Libraries/LibWeb/HTML/BroadcastChannel.cpp b/Libraries/LibWeb/HTML/BroadcastChannel.cpp
index 092eb4d3041..b421898dd69 100644
--- a/Libraries/LibWeb/HTML/BroadcastChannel.cpp
+++ b/Libraries/LibWeb/HTML/BroadcastChannel.cpp
@@ -31,13 +31,6 @@ void BroadcastChannel::initialize(JS::Realm& realm)
     WEB_SET_PROTOTYPE_FOR_INTERFACE(BroadcastChannel);
 }
 
-// https://html.spec.whatwg.org/multipage/web-messaging.html#dom-broadcastchannel-name
-FlyString BroadcastChannel::name()
-{
-    // The name getter steps are to return this's channel name.
-    return m_channel_name;
-}
-
 // https://html.spec.whatwg.org/multipage/web-messaging.html#dom-broadcastchannel-close
 void BroadcastChannel::close()
 {
@@ -46,25 +39,25 @@ void BroadcastChannel::close()
 }
 
 // https://html.spec.whatwg.org/multipage/web-messaging.html#handler-broadcastchannel-onmessage
-void BroadcastChannel::set_onmessage(WebIDL::CallbackType* event_handler)
+void BroadcastChannel::set_onmessage(GC::Ptr<WebIDL::CallbackType> event_handler)
 {
     set_event_handler_attribute(HTML::EventNames::message, event_handler);
 }
 
 // https://html.spec.whatwg.org/multipage/web-messaging.html#handler-broadcastchannel-onmessage
-WebIDL::CallbackType* BroadcastChannel::onmessage()
+GC::Ptr<WebIDL::CallbackType> BroadcastChannel::onmessage()
 {
     return event_handler_attribute(HTML::EventNames::message);
 }
 
 // https://html.spec.whatwg.org/multipage/web-messaging.html#handler-broadcastchannel-onmessageerror
-void BroadcastChannel::set_onmessageerror(WebIDL::CallbackType* event_handler)
+void BroadcastChannel::set_onmessageerror(GC::Ptr<WebIDL::CallbackType> event_handler)
 {
     set_event_handler_attribute(HTML::EventNames::messageerror, event_handler);
 }
 
 // https://html.spec.whatwg.org/multipage/web-messaging.html#handler-broadcastchannel-onmessageerror
-WebIDL::CallbackType* BroadcastChannel::onmessageerror()
+GC::Ptr<WebIDL::CallbackType> BroadcastChannel::onmessageerror()
 {
     return event_handler_attribute(HTML::EventNames::messageerror);
 }
diff --git a/Libraries/LibWeb/HTML/BroadcastChannel.h b/Libraries/LibWeb/HTML/BroadcastChannel.h
index 1c1b1193272..19ee7033bbc 100644
--- a/Libraries/LibWeb/HTML/BroadcastChannel.h
+++ b/Libraries/LibWeb/HTML/BroadcastChannel.h
@@ -17,14 +17,19 @@ class BroadcastChannel final : public DOM::EventTarget {
 public:
     [[nodiscard]] static GC::Ref<BroadcastChannel> construct_impl(JS::Realm&, FlyString const& name);
 
-    FlyString name();
+    // https://html.spec.whatwg.org/multipage/web-messaging.html#dom-broadcastchannel-name
+    FlyString const& name() const
+    {
+        // The name getter steps are to return this's channel name.
+        return m_channel_name;
+    }
 
     void close();
 
-    void set_onmessage(WebIDL::CallbackType*);
-    WebIDL::CallbackType* onmessage();
-    void set_onmessageerror(WebIDL::CallbackType*);
-    WebIDL::CallbackType* onmessageerror();
+    void set_onmessage(GC::Ptr<WebIDL::CallbackType>);
+    GC::Ptr<WebIDL::CallbackType> onmessage();
+    void set_onmessageerror(GC::Ptr<WebIDL::CallbackType>);
+    GC::Ptr<WebIDL::CallbackType> onmessageerror();
 
 private:
     BroadcastChannel(JS::Realm&, FlyString const& name);