Bug 1974444: Nothing sets or uses this. r=mjf

docfaraday · docfaraday · commit 0f74bd2ded62 · 2025-07-01T15:10:34.000Z
Differential Revision: https://phabricator.services.mozilla.com/D255534
diff --git a/dom/media/webrtc/jsapi/RTCDataChannel.cpp b/dom/media/webrtc/jsapi/RTCDataChannel.cpp
@@ -44,7 +44,7 @@ RTCDataChannel::~RTCDataChannel() {
   // one) once we block GC until all the (appropriate) onXxxx handlers
   // are dropped. (See WebRTC spec)
   DC_DEBUG(("%p: Close()ing %p", this, mDataChannel.get()));
-  mDataChannel->SetListener(nullptr, nullptr);
+  mDataChannel->SetListener(nullptr);
   mDataChannel->Close();
 }
 
@@ -93,7 +93,7 @@ nsresult RTCDataChannel::Init(nsPIDOMWindowInner* aDOMWindow) {
   nsAutoString urlParam;
 
   MOZ_ASSERT(mDataChannel);
-  mDataChannel->SetListener(this, nullptr);
+  mDataChannel->SetListener(this);
 
   // Now grovel through the objects to get a usable origin for onMessage
   nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface(aDOMWindow);
@@ -337,20 +337,17 @@ nsresult RTCDataChannel::DoOnMessageAvailable(const nsACString& aData,
   return err.StealNSResult();
 }
 
-nsresult RTCDataChannel::OnMessageAvailable(nsISupports* aContext,
-                                            const nsACString& aMessage) {
+nsresult RTCDataChannel::OnMessageAvailable(const nsACString& aMessage) {
   MOZ_ASSERT(NS_IsMainThread());
   return DoOnMessageAvailable(aMessage, false);
 }
 
-nsresult RTCDataChannel::OnBinaryMessageAvailable(nsISupports* aContext,
-                                                  const nsACString& aMessage) {
+nsresult RTCDataChannel::OnBinaryMessageAvailable(const nsACString& aMessage) {
   MOZ_ASSERT(NS_IsMainThread());
   return DoOnMessageAvailable(aMessage, true);
 }
 
-nsresult RTCDataChannel::OnSimpleEvent(nsISupports* aContext,
-                                       const nsAString& aName) {
+nsresult RTCDataChannel::OnSimpleEvent(const nsAString& aName) {
   MOZ_ASSERT(NS_IsMainThread());
 
   nsresult rv = CheckCurrentGlobalCorrectness();
@@ -368,14 +365,14 @@ nsresult RTCDataChannel::OnSimpleEvent(nsISupports* aContext,
   return err.StealNSResult();
 }
 
-nsresult RTCDataChannel::OnChannelConnected(nsISupports* aContext) {
+nsresult RTCDataChannel::OnChannelConnected() {
   DC_DEBUG(
       ("%p(%p): %s - Dispatching\n", this, (void*)mDataChannel, __FUNCTION__));
 
-  return OnSimpleEvent(aContext, u"open"_ns);
+  return OnSimpleEvent(u"open"_ns);
 }
 
-nsresult RTCDataChannel::OnChannelClosed(nsISupports* aContext) {
+nsresult RTCDataChannel::OnChannelClosed() {
   nsresult rv;
   // so we don't have to worry if we're notified from different paths in
   // the underlying code
@@ -385,7 +382,7 @@ nsresult RTCDataChannel::OnChannelClosed(nsISupports* aContext) {
     DC_DEBUG(("%p(%p): %s - Dispatching\n", this, (void*)mDataChannel,
               __FUNCTION__));
 
-    rv = OnSimpleEvent(aContext, u"close"_ns);
+    rv = OnSimpleEvent(u"close"_ns);
     // no more events can happen
     mSentClose = true;
   } else {
@@ -395,14 +392,14 @@ nsresult RTCDataChannel::OnChannelClosed(nsISupports* aContext) {
   return rv;
 }
 
-nsresult RTCDataChannel::OnBufferLow(nsISupports* aContext) {
+nsresult RTCDataChannel::OnBufferLow() {
   DC_DEBUG(
       ("%p(%p): %s - Dispatching\n", this, (void*)mDataChannel, __FUNCTION__));
 
-  return OnSimpleEvent(aContext, u"bufferedamountlow"_ns);
+  return OnSimpleEvent(u"bufferedamountlow"_ns);
 }
 
-nsresult RTCDataChannel::NotBuffered(nsISupports* aContext) {
+nsresult RTCDataChannel::NotBuffered() {
   // In the rare case that we held off GC to let the buffer drain
   UpdateMustKeepAlive();
   return NS_OK;
diff --git a/dom/media/webrtc/jsapi/RTCDataChannel.h b/dom/media/webrtc/jsapi/RTCDataChannel.h
@@ -78,21 +78,20 @@ class RTCDataChannel final : public DOMEventTargetHelper,
 
   nsresult DoOnMessageAvailable(const nsACString& aMessage, bool aBinary);
 
-  virtual nsresult OnMessageAvailable(nsISupports* aContext,
-                                      const nsACString& aMessage) override;
+  virtual nsresult OnMessageAvailable(const nsACString& aMessage) override;
 
   virtual nsresult OnBinaryMessageAvailable(
-      nsISupports* aContext, const nsACString& aMessage) override;
+      const nsACString& aMessage) override;
 
-  virtual nsresult OnSimpleEvent(nsISupports* aContext, const nsAString& aName);
+  virtual nsresult OnSimpleEvent(const nsAString& aName);
 
-  virtual nsresult OnChannelConnected(nsISupports* aContext) override;
+  virtual nsresult OnChannelConnected() override;
 
-  virtual nsresult OnChannelClosed(nsISupports* aContext) override;
+  virtual nsresult OnChannelClosed() override;
 
-  virtual nsresult OnBufferLow(nsISupports* aContext) override;
+  virtual nsresult OnBufferLow() override;
 
-  virtual nsresult NotBuffered(nsISupports* aContext) override;
+  virtual nsresult NotBuffered() override;
 
   // if there are "strong event listeners" or outgoing not sent messages
   // then this method keeps the object alive when js doesn't have strong
diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp
@@ -1513,10 +1513,8 @@ void DataChannel::ReleaseConnection() {
   mConnection = nullptr;
 }
 
-void DataChannel::SetListener(DataChannelListener* aListener,
-                              nsISupports* aContext) {
+void DataChannel::SetListener(DataChannelListener* aListener) {
   MOZ_ASSERT(NS_IsMainThread());
-  mContext = aContext;
   mListener = aListener;
 }
 
@@ -1557,12 +1555,12 @@ void DataChannel::DecrementBufferedAmount(uint32_t aSize) {
         if (!wasLow && mBufferedAmount <= mBufferedThreshold) {
           DC_DEBUG(("%s: sending BUFFER_LOW_THRESHOLD for %s/%s: %u",
                     __FUNCTION__, mLabel.get(), mProtocol.get(), mStream));
-          mListener->OnBufferLow(mContext);
+          mListener->OnBufferLow();
         }
         if (mBufferedAmount == 0) {
           DC_DEBUG(("%s: sending NO_LONGER_BUFFERED for %s/%s: %u",
                     __FUNCTION__, mLabel.get(), mProtocol.get(), mStream));
-          mListener->NotBuffered(mContext);
+          mListener->NotBuffered();
           if (mReadyState == DataChannelState::Closing) {
             if (mConnection) {
               // We're done sending
@@ -1590,7 +1588,7 @@ void DataChannel::AnnounceOpen() {
           DC_DEBUG(("%s: sending ON_CHANNEL_OPEN for %s/%s: %u", __FUNCTION__,
                     mLabel.get(), mProtocol.get(), mStream));
           if (mListener) {
-            mListener->OnChannelConnected(mContext);
+            mListener->OnChannelConnected();
           }
         }
       }));
@@ -1626,7 +1624,7 @@ void DataChannel::AnnounceClosed() {
         if (mListener) {
           DC_DEBUG(("%s: sending ON_CHANNEL_CLOSED for %s/%s: %u", __FUNCTION__,
                     mLabel.get(), mProtocol.get(), mStream));
-          mListener->OnChannelClosed(mContext);
+          mListener->OnChannelClosed();
         }
 
         // Stats stuff
@@ -1761,10 +1759,9 @@ nsresult DataChannelOnMessageAvailable::Run() {
       }
 
       if (mType == EventType::OnDataString) {
-        mChannel->mListener->OnMessageAvailable(mChannel->mContext, mData);
+        mChannel->mListener->OnMessageAvailable(mData);
       } else {
-        mChannel->mListener->OnBinaryMessageAvailable(mChannel->mContext,
-                                                      mData);
+        mChannel->mListener->OnBinaryMessageAvailable(mData);
       }
       break;
     case EventType::OnDisconnected:
diff --git a/netwerk/sctp/datachannel/DataChannel.h b/netwerk/sctp/datachannel/DataChannel.h
@@ -413,7 +413,7 @@ class DataChannel {
   void Close();
 
   // Set the listener (especially for channels created from the other side)
-  void SetListener(DataChannelListener* aListener, nsISupports* aContext);
+  void SetListener(DataChannelListener* aListener);
 
   // Helper for send methods that converts POSIX error codes to an ErrorResult.
   static void SendErrnoToErrorResult(int error, size_t aMessageSize,
@@ -473,7 +473,6 @@ class DataChannel {
 
   // Mainthread only
   DataChannelListener* mListener = nullptr;
-  nsCOMPtr<nsISupports> mContext;
   bool mEverOpened = false;
   const nsCString mLabel;
   const nsCString mProtocol;
diff --git a/netwerk/sctp/datachannel/DataChannelListener.h b/netwerk/sctp/datachannel/DataChannelListener.h
@@ -7,7 +7,6 @@
 #ifndef NETWERK_SCTP_DATACHANNEL_DATACHANNELLISTENER_H_
 #define NETWERK_SCTP_DATACHANNEL_DATACHANNELLISTENER_H_
 
-#include "nsISupports.h"
 #include "nsString.h"
 
 namespace mozilla {
@@ -20,24 +19,22 @@ class DataChannelListener {
   virtual ~DataChannelListener() = default;
 
   // Called when a DOMString message is received.
-  virtual nsresult OnMessageAvailable(nsISupports* aContext,
-                                      const nsACString& message) = 0;
+  virtual nsresult OnMessageAvailable(const nsACString& message) = 0;
 
   // Called when a binary message is received.
-  virtual nsresult OnBinaryMessageAvailable(nsISupports* aContext,
-                                            const nsACString& message) = 0;
+  virtual nsresult OnBinaryMessageAvailable(const nsACString& message) = 0;
 
   // Called when the channel is connected
-  virtual nsresult OnChannelConnected(nsISupports* aContext) = 0;
+  virtual nsresult OnChannelConnected() = 0;
 
   // Called when the channel is closed
-  virtual nsresult OnChannelClosed(nsISupports* aContext) = 0;
+  virtual nsresult OnChannelClosed() = 0;
 
   // Called when the BufferedAmount drops below the BufferedAmountLowThreshold
-  virtual nsresult OnBufferLow(nsISupports* aContext) = 0;
+  virtual nsresult OnBufferLow() = 0;
 
   // Called when the BufferedAmount drops to 0
-  virtual nsresult NotBuffered(nsISupports* aContext) = 0;
+  virtual nsresult NotBuffered() = 0;
 };
 
 }  // namespace mozilla
