Bug 572520: step 3, remove unused parameters on imgRequestProxy::on*. r=jrmuizel,bholley

modules/libpr0n/src/imgRequest.cpp

@@ -302,7 +302,7 @@ nsresult imgRequest::RemoveProxy(imgRequestProxy *proxy, nsresult aStatus, PRBoo
 
   // make sure that observer gets an OnStopRequest message sent to it
   if (!(mState & stateRequestStopped)) {
-    proxy->OnStopRequest(nsnull, nsnull, NS_BINDING_ABORTED, PR_TRUE);
+    proxy->OnStopRequest(PR_TRUE);
   }
 
   if (mImage && !HaveProxyWithObserver(nsnull)) {
@@ -361,7 +361,7 @@ nsresult imgRequest::NotifyProxyListener(imgRequestProxy *proxy)
 
   // OnStartRequest
   if (mState & stateRequestStarted)
-    proxy->OnStartRequest(nsnull, nsnull);
+    proxy->OnStartRequest();
 
   // OnStartContainer
   if (mState & stateHasSize)
@@ -404,9 +404,7 @@ nsresult imgRequest::NotifyProxyListener(imgRequestProxy *proxy)
 
   if (mState & stateRequestStopped) {
     proxy->OnStopDecode(GetResultFromImageStatus(mImageStatus), nsnull);
-    proxy->OnStopRequest(nsnull, nsnull,
-                         GetResultFromImageStatus(mImageStatus),
-                         mHadLastPart);
+    proxy->OnStopRequest(mHadLastPart);
   }
 
   return NS_OK;
@@ -895,7 +893,7 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt
   /* notify our kids */
   nsTObserverArray<imgRequestProxy*>::ForwardIterator iter(mObservers);
   while (iter.HasMore()) {
-    iter.GetNext()->OnStartRequest(aRequest, ctxt);
+    iter.GetNext()->OnStartRequest();
   }
 
   /* Get our principal */
@@ -1043,7 +1041,7 @@ NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt,
 
   nsTObserverArray<imgRequestProxy*>::ForwardIterator srIter(mObservers);
   while (srIter.HasMore()) {
-    srIter.GetNext()->OnStopRequest(aRequest, ctxt, status, mHadLastPart);
+    srIter.GetNext()->OnStopRequest(mHadLastPart);
   }
 
   return NS_OK;

modules/libpr0n/src/imgRequestProxy.cpp

@@ -613,7 +613,7 @@ void imgRequestProxy::OnDiscard()
 
 
 
-void imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
+void imgRequestProxy::OnStartRequest()
 {
 #ifdef PR_LOGGING
   nsCAutoString name;
@@ -630,8 +630,7 @@ void imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
   }
 }
 
-void imgRequestProxy::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
-                                    nsresult statusCode, PRBool lastPart)
+void imgRequestProxy::OnStopRequest(PRBool lastPart)
 {
 #ifdef PR_LOGGING
   nsCAutoString name;

modules/libpr0n/src/imgRequestProxy.h

@@ -121,9 +121,9 @@ protected:
   /* non-virtual imgIContainerObserver methods */
   void FrameChanged(imgIContainer *aContainer, nsIntRect * aDirtyRect);
 
-  /* non-virtual nsIRequestObserver (plus some) methods */
-  void OnStartRequest(nsIRequest *request, nsISupports *ctxt);
-  void OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode, PRBool aLastPart); 
+  /* non-virtual sort-of-nsIRequestObserver methods */
+  void OnStartRequest();
+  void OnStopRequest(PRBool aLastPart);
 
   inline PRBool HasObserver() const {
     return mListener != nsnull;