Bug 1551306 - Remove context parameter from nsIProgressEventSink.onPr…

…ogress() and nsIProgressEventSink.onStatus() r=valentin Differential Revision: https://phabricator.services.mozilla.com/D68235
iaxat · Mar 27, 2020 · da81dcd · da81dcd
1 parent 5142ec6
commit da81dcd
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 101 deletions.
diff --git a/browser/base/content/aboutDialog-appUpdater-legacy.js b/browser/base/content/aboutDialog-appUpdater-legacy.js
@@ -435,12 +435,12 @@ appUpdater.prototype = {
   /**
    * See nsIProgressEventSink.idl
    */
-  onStatus(aRequest, aContext, aStatus, aStatusArg) {},
+  onStatus(aRequest, aStatus, aStatusArg) {},
 
   /**
    * See nsIProgressEventSink.idl
    */
-  onProgress(aRequest, aContext, aProgress, aProgressMax) {
+  onProgress(aRequest, aProgress, aProgressMax) {
     this.downloadStatus.textContent = DownloadUtils.getTransferTotal(
       aProgress,
       aProgressMax

diff --git a/browser/modules/AppUpdater.jsm b/browser/modules/AppUpdater.jsm
@@ -339,12 +339,12 @@ class AppUpdater {
   /**
    * See nsIProgressEventSink.idl
    */
-  onStatus(aRequest, aContext, aStatus, aStatusArg) {}
+  onStatus(aRequest, aStatus, aStatusArg) {}
 
   /**
    * See nsIProgressEventSink.idl
    */
-  onProgress(aRequest, aContext, aProgress, aProgressMax) {
+  onProgress(aRequest, aProgress, aProgressMax) {
     this._setStatus(AppUpdater.STATUS.DOWNLOADING, aProgress, aProgressMax);
   }
 

diff --git a/devtools/server/actors/network-monitor/network-response-listener.js b/devtools/server/actors/network-monitor/network-response-listener.js
@@ -379,7 +379,7 @@ NetworkResponseListener.prototype = {
    * Handle progress event as data is transferred.  This is used to record the
    * size on the wire, which may be compressed / encoded.
    */
-  onProgress: function(request, context, progress, progressMax) {
+  onProgress: function(request, progress, progressMax) {
     this.transferredSize = progress;
     // Need to forward as well to keep things like Download Manager's progress
     // bar working properly.

diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -226,15 +226,13 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest* request) {
 }
 
 NS_IMETHODIMP nsPluginStreamListenerPeer::OnProgress(nsIRequest* request,
-                                                     nsISupports* aContext,
                                                      int64_t aProgress,
                                                      int64_t aProgressMax) {
   nsresult rv = NS_OK;
   return rv;
 }
 
 NS_IMETHODIMP nsPluginStreamListenerPeer::OnStatus(nsIRequest* request,
-                                                   nsISupports* aContext,
                                                    nsresult aStatus,
                                                    const char16_t* aStatusArg) {
   return NS_OK;

diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.cpp b/dom/webbrowserpersist/nsWebBrowserPersist.cpp
@@ -976,7 +976,6 @@ nsWebBrowserPersist::OnDataAvailable(nsIRequest* request,
 //*****************************************************************************
 
 NS_IMETHODIMP nsWebBrowserPersist::OnProgress(nsIRequest* request,
-                                              nsISupports* ctxt,
                                               int64_t aProgress,
                                               int64_t aProgressMax) {
   if (!mProgressListener) {
@@ -1013,14 +1012,14 @@ NS_IMETHODIMP nsWebBrowserPersist::OnProgress(nsIRequest* request,
   // If our progress listener implements nsIProgressEventSink,
   // forward the notification
   if (mEventSink) {
-    mEventSink->OnProgress(request, ctxt, aProgress, aProgressMax);
+    mEventSink->OnProgress(request, aProgress, aProgressMax);
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsWebBrowserPersist::OnStatus(nsIRequest* request,
-                                            nsISupports* ctxt, nsresult status,
+                                            nsresult status,
                                             const char16_t* statusArg) {
   if (mProgressListener) {
     // We need to filter out non-error error codes.
@@ -1051,7 +1050,7 @@ NS_IMETHODIMP nsWebBrowserPersist::OnStatus(nsIRequest* request,
   // If our progress listener implements nsIProgressEventSink,
   // forward the notification
   if (mEventSink) {
-    mEventSink->OnStatus(request, ctxt, status, statusArg);
+    mEventSink->OnStatus(request, status, statusArg);
   }
 
   return NS_OK;

diff --git a/dom/xhr/XMLHttpRequestMainThread.cpp b/dom/xhr/XMLHttpRequestMainThread.cpp
@@ -3277,8 +3277,7 @@ nsresult XMLHttpRequestMainThread::OnRedirectVerifyCallback(nsresult result) {
 //
 
 NS_IMETHODIMP
-XMLHttpRequestMainThread::OnProgress(nsIRequest* aRequest,
-                                     nsISupports* aContext, int64_t aProgress,
+XMLHttpRequestMainThread::OnProgress(nsIRequest* aRequest, int64_t aProgress,
                                      int64_t aProgressMax) {
   // When uploading, OnProgress reports also headers in aProgress and
   // aProgressMax. So, try to remove the headers, if possible.
@@ -3303,18 +3302,17 @@ XMLHttpRequestMainThread::OnProgress(nsIRequest* aRequest,
   }
 
   if (mProgressEventSink) {
-    mProgressEventSink->OnProgress(aRequest, aContext, aProgress, aProgressMax);
+    mProgressEventSink->OnProgress(aRequest, aProgress, aProgressMax);
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-XMLHttpRequestMainThread::OnStatus(nsIRequest* aRequest, nsISupports* aContext,
-                                   nsresult aStatus,
+XMLHttpRequestMainThread::OnStatus(nsIRequest* aRequest, nsresult aStatus,
                                    const char16_t* aStatusArg) {
   if (mProgressEventSink) {
-    mProgressEventSink->OnStatus(aRequest, aContext, aStatus, aStatusArg);
+    mProgressEventSink->OnStatus(aRequest, aStatus, aStatusArg);
   }
 
   return NS_OK;

diff --git a/image/imgLoader.cpp b/image/imgLoader.cpp
@@ -549,8 +549,8 @@ NS_IMPL_ISUPPORTS(nsProgressNotificationProxy, nsIProgressEventSink,
                   nsIChannelEventSink, nsIInterfaceRequestor)
 
 NS_IMETHODIMP
-nsProgressNotificationProxy::OnProgress(nsIRequest* request, nsISupports* ctxt,
-                                        int64_t progress, int64_t progressMax) {
+nsProgressNotificationProxy::OnProgress(nsIRequest* request, int64_t progress,
+                                        int64_t progressMax) {
   nsCOMPtr<nsILoadGroup> loadGroup;
   request->GetLoadGroup(getter_AddRefs(loadGroup));
 
@@ -561,12 +561,11 @@ nsProgressNotificationProxy::OnProgress(nsIRequest* request, nsISupports* ctxt,
   if (!target) {
     return NS_OK;
   }
-  return target->OnProgress(mImageRequest, ctxt, progress, progressMax);
+  return target->OnProgress(mImageRequest, progress, progressMax);
 }
 
 NS_IMETHODIMP
-nsProgressNotificationProxy::OnStatus(nsIRequest* request, nsISupports* ctxt,
-                                      nsresult status,
+nsProgressNotificationProxy::OnStatus(nsIRequest* request, nsresult status,
                                       const char16_t* statusArg) {
   nsCOMPtr<nsILoadGroup> loadGroup;
   request->GetLoadGroup(getter_AddRefs(loadGroup));
@@ -578,7 +577,7 @@ nsProgressNotificationProxy::OnStatus(nsIRequest* request, nsISupports* ctxt,
   if (!target) {
     return NS_OK;
   }
-  return target->OnStatus(mImageRequest, ctxt, status, statusArg);
+  return target->OnStatus(mImageRequest, status, statusArg);
 }
 
 NS_IMETHODIMP

diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp
@@ -532,7 +532,7 @@ void nsJARChannel::FireOnProgress(uint64_t aProgress) {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mProgressSink);
 
-  mProgressSink->OnProgress(this, nullptr, aProgress, mContentLength);
+  mProgressSink->OnProgress(this, aProgress, mContentLength);
 }
 
 //-----------------------------------------------------------------------------

diff --git a/netwerk/base/nsBaseChannel.cpp b/netwerk/base/nsBaseChannel.cpp
@@ -757,12 +757,12 @@ nsBaseChannel::OnTransportStatus(nsITransport* transport, nsresult status,
   if (!HasLoadFlag(LOAD_BACKGROUND)) {
     nsAutoString statusArg;
     if (GetStatusArg(status, statusArg)) {
-      mProgressSink->OnStatus(this, nullptr, status, statusArg.get());
+      mProgressSink->OnStatus(this, status, statusArg.get());
     }
   }
 
   if (progress) {
-    mProgressSink->OnProgress(this, nullptr, progress, progressMax);
+    mProgressSink->OnProgress(this, progress, progressMax);
   }
 
   return NS_OK;

diff --git a/netwerk/base/nsIProgressEventSink.idl b/netwerk/base/nsIProgressEventSink.idl
@@ -36,9 +36,6 @@ interface nsIProgressEventSink : nsISupports
      *
      * @param aRequest
      *        the request being observed (may QI to nsIChannel).
-     * @param aContext
-     *        if aRequest is a channel, then this parameter is the listener
-     *        context passed to nsIChannel::asyncOpen.
      * @param aProgress
      *        numeric value in the range 0 to aProgressMax indicating the
      *        number of bytes transfered thus far.
@@ -47,7 +44,6 @@ interface nsIProgressEventSink : nsISupports
      *        transfered (or -1 if total is unknown).
      */
     void onProgress(in nsIRequest aRequest,
-                    in nsISupports aContext,
                     in long long aProgress,
                     in long long aProgressMax);
 
@@ -57,9 +53,6 @@ interface nsIProgressEventSink : nsISupports
      *
      * @param aRequest
      *        the request being observed (may QI to nsIChannel).
-     * @param aContext
-     *        if aRequest is a channel, then this parameter is the listener
-     *        context passed to nsIChannel::asyncOpen.
      * @param aStatus
      *        status code (not necessarily an error code) indicating the
      *        state of the channel (usually the state of the underlying
@@ -73,7 +66,6 @@ interface nsIProgressEventSink : nsISupports
      *        indicates the host:port associated with the status code.
      */
     void onStatus(in nsIRequest aRequest,
-                  in nsISupports aContext,
                   in nsresult aStatus,
                   in wstring aStatusArg);
 

diff --git a/netwerk/base/nsIncrementalDownload.cpp b/netwerk/base/nsIncrementalDownload.cpp
@@ -115,7 +115,6 @@ class nsIncrementalDownload final : public nsIIncrementalDownload,
   nsresult ClearRequestHeader(nsIHttpChannel* channel);
 
   nsCOMPtr<nsIRequestObserver> mObserver;
-  nsCOMPtr<nsISupports> mObserverContext;
   nsCOMPtr<nsIProgressEventSink> mProgressSink;
   nsCOMPtr<nsIURI> mURI;
   nsCOMPtr<nsIURI> mFinalURI;
@@ -174,8 +173,7 @@ void nsIncrementalDownload::UpdateProgress() {
   mLastProgressUpdate = PR_Now();
 
   if (mProgressSink)
-    mProgressSink->OnProgress(this, mObserverContext, mCurrentSize + mChunkLen,
-                              mTotalSize);
+    mProgressSink->OnProgress(this, mCurrentSize + mChunkLen, mTotalSize);
 }
 
 nsresult nsIncrementalDownload::CallOnStartRequest() {
@@ -196,7 +194,6 @@ void nsIncrementalDownload::CallOnStopRequest() {
 
   mObserver->OnStopRequest(this, mStatus);
   mObserver = nullptr;
-  mObserverContext = nullptr;
 }
 
 nsresult nsIncrementalDownload::StartTimer(int32_t interval) {
@@ -468,7 +465,6 @@ nsIncrementalDownload::Start(nsIRequestObserver* observer,
   if (NS_FAILED(rv)) return rv;
 
   mObserver = observer;
-  mObserverContext = context;
   mProgressSink = do_QueryInterface(observer);  // ok if null
 
   mIsPending = true;

diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -89,17 +89,17 @@ InterceptStreamListener::OnStartRequest(nsIRequest* aRequest) {
 }
 
 NS_IMETHODIMP
-InterceptStreamListener::OnStatus(nsIRequest* aRequest, nsISupports* aContext,
-                                  nsresult status, const char16_t* aStatusArg) {
+InterceptStreamListener::OnStatus(nsIRequest* aRequest, nsresult status,
+                                  const char16_t* aStatusArg) {
   if (mOwner) {
     mOwner->DoOnStatus(mOwner, status);
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
-InterceptStreamListener::OnProgress(nsIRequest* aRequest, nsISupports* aContext,
-                                    int64_t aProgress, int64_t aProgressMax) {
+InterceptStreamListener::OnProgress(nsIRequest* aRequest, int64_t aProgress,
+                                    int64_t aProgressMax) {
   if (mOwner) {
     mOwner->DoOnProgress(mOwner, aProgress, aProgressMax);
   }
@@ -124,11 +124,10 @@ InterceptStreamListener::OnDataAvailable(nsIRequest* aRequest,
     nsAutoCString host;
     uri->GetHost(host);
 
-    OnStatus(mOwner, nullptr, NS_NET_STATUS_READING,
-             NS_ConvertUTF8toUTF16(host).get());
+    OnStatus(mOwner, NS_NET_STATUS_READING, NS_ConvertUTF8toUTF16(host).get());
 
     int64_t progress = aOffset + aCount;
-    OnProgress(mOwner, nullptr, progress, mOwner->mSynthesizedStreamLength);
+    OnProgress(mOwner, progress, mOwner->mSynthesizedStreamLength);
   }
 
   mOwner->DoOnDataAvailable(mOwner, nullptr, aInputStream, aOffset, aCount);
@@ -930,7 +929,7 @@ void HttpChannelChild::DoOnStatus(nsIRequest* aRequest, nsresult status) {
       !(mLoadFlags & LOAD_BACKGROUND)) {
     nsAutoCString host;
     mURI->GetHost(host);
-    mProgressSink->OnStatus(aRequest, nullptr, status,
+    mProgressSink->OnStatus(aRequest, status,
                             NS_ConvertUTF8toUTF16(host).get());
   }
 }
@@ -951,7 +950,7 @@ void HttpChannelChild::DoOnProgress(nsIRequest* aRequest, int64_t progress,
     // OnProgress
     //
     if (progress > 0) {
-      mProgressSink->OnProgress(aRequest, nullptr, progress, progressMax);
+      mProgressSink->OnProgress(aRequest, progress, progressMax);
     }
   }
 }

diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1835,8 +1835,8 @@ mozilla::ipc::IPCResult HttpChannelParent::RecvOpenAltDataCacheInputStream(
 //-----------------------------------------------------------------------------
 
 NS_IMETHODIMP
-HttpChannelParent::OnProgress(nsIRequest* aRequest, nsISupports* aContext,
-                              int64_t aProgress, int64_t aProgressMax) {
+HttpChannelParent::OnProgress(nsIRequest* aRequest, int64_t aProgress,
+                              int64_t aProgressMax) {
   LOG(("HttpChannelParent::OnProgress [this=%p progress=%" PRId64 "max=%" PRId64
        "]\n",
        this, aProgress, aProgressMax));
@@ -1865,8 +1865,8 @@ HttpChannelParent::OnProgress(nsIRequest* aRequest, nsISupports* aContext,
 }
 
 NS_IMETHODIMP
-HttpChannelParent::OnStatus(nsIRequest* aRequest, nsISupports* aContext,
-                            nsresult aStatus, const char16_t* aStatusArg) {
+HttpChannelParent::OnStatus(nsIRequest* aRequest, nsresult aStatus,
+                            const char16_t* aStatusArg) {
   LOG(("HttpChannelParent::OnStatus [this=%p status=%" PRIx32 "]\n", this,
        static_cast<uint32_t>(aStatus)));
   MOZ_ASSERT(NS_IsMainThread());

diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
@@ -414,10 +414,9 @@ void InterceptedHttpChannel::MaybeCallStatusAndProgress() {
     CopyUTF8toUTF16(host, mStatusHost);
   }
 
-  mProgressSink->OnStatus(this, nullptr, NS_NET_STATUS_READING,
-                          mStatusHost.get());
+  mProgressSink->OnStatus(this, NS_NET_STATUS_READING, mStatusHost.get());
 
-  mProgressSink->OnProgress(this, nullptr, progress, mSynthesizedStreamLength);
+  mProgressSink->OnProgress(this, progress, mSynthesizedStreamLength);
 
   mProgressReported = progress;
 }

diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -8659,8 +8659,7 @@ nsHttpChannel::OnTransportStatus(nsITransport* trans, nsresult status,
     nsAutoCString host;
     mURI->GetHost(host);
     if (!(mLoadFlags & LOAD_BACKGROUND)) {
-      mProgressSink->OnStatus(this, nullptr, status,
-                              NS_ConvertUTF8toUTF16(host).get());
+      mProgressSink->OnStatus(this, status, NS_ConvertUTF8toUTF16(host).get());
     } else {
       nsCOMPtr<nsIParentChannel> parentChannel;
       NS_QueryNotificationCallbacks(this, parentChannel);
@@ -8671,7 +8670,7 @@ nsHttpChannel::OnTransportStatus(nsITransport* trans, nsresult status,
       // LOAD_BACKGROUND is checked again in |HttpChannelChild|, so the final
       // consumer won't get this event.
       if (SameCOMIdentity(parentChannel, mProgressSink)) {
-        mProgressSink->OnStatus(this, nullptr, status,
+        mProgressSink->OnStatus(this, status,
                                 NS_ConvertUTF8toUTF16(host).get());
       }
     }
@@ -8686,7 +8685,7 @@ nsHttpChannel::OnTransportStatus(nsITransport* trans, nsresult status,
         GetCallback(mProgressSink);
       }
       if (mProgressSink) {
-        mProgressSink->OnProgress(this, nullptr, progress, progressMax);
+        mProgressSink->OnProgress(this, progress, progressMax);
       }
     }
   }

diff --git a/netwerk/test/unit/test_post.js b/netwerk/test/unit/test_post.js
@@ -45,14 +45,14 @@ var listenerCallback = {
     throw Cr.NS_ERROR_NO_INTERFACE;
   },
 
-  onProgress(request, context, progress, progressMax) {
+  onProgress(request, progress, progressMax) {
     // this works because the response is 0 bytes and does not trigger onprogress
     if (progress === progressMax) {
       correctOnProgress = true;
     }
   },
 
-  onStatus(request, context, status, statusArg) {},
+  onStatus(request, status, statusArg) {},
 };
 
 function run_test() {