corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1525319 - Removing context from OnStopRequest r=valentin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D20770
This commit is contained in:
Jonathan Kingston
2019-02-27 23:41:31 +00:00
parent 649c453cbd
commit 3ef1df37e1
111 changed files with 179 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docshell/base/nsPingListener.cpp
View File

@@ -341,7 +341,7 @@ nsPingListener::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
}
NS_IMETHODIMP
nsPingListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsPingListener::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
mLoadGroup = nullptr;

2
dom/base/DOMParser.cpp
View File

@@ -209,7 +209,7 @@ already_AddRefed<Document> DOMParser::ParseFromStream(nsIInputStream* aStream,
parserChannel->GetStatus(&status);
}
rv = listener->OnStopRequest(parserChannel, nullptr, status);
rv = listener->OnStopRequest(parserChannel, status);
// Failure returned from OnStopRequest does not affect the final status of
// the channel, so we do not need to call Cancel(rv) as we do above.

3
dom/base/Document.cpp
View File

@@ -996,13 +996,12 @@ ExternalResourceMap::PendingLoad::OnDataAvailable(nsIRequest* aRequest,
NS_IMETHODIMP
ExternalResourceMap::PendingLoad::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatus) {
// mTargetListener might be null if SetupViewer or AddExternalResource failed
if (mTargetListener) {
nsCOMPtr<nsIStreamListener> listener;
mTargetListener.swap(listener);
return listener->OnStopRequest(aRequest, aContext, aStatus);
return listener->OnStopRequest(aRequest, aStatus);
}
return NS_OK;

2
dom/base/EventSource.cpp
View File

@@ -725,7 +725,7 @@ EventSourceImpl::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
}
NS_IMETHODIMP
EventSourceImpl::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
EventSourceImpl::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
AssertIsOnMainThread();

2
dom/base/Navigator.cpp
View File

@@ -1049,7 +1049,7 @@ BeaconStreamListener::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
BeaconStreamListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
BeaconStreamListener::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
return NS_OK;
}

5
dom/base/nsObjectLoadingContent.cpp
View File

@@ -1012,7 +1012,6 @@ nsObjectLoadingContent::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
nsObjectLoadingContent::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatusCode) {
AUTO_PROFILER_LABEL("nsObjectLoadingContent::OnStopRequest", NETWORK);
@@ -1038,7 +1037,7 @@ nsObjectLoadingContent::OnStopRequest(nsIRequest* aRequest,
// This may re-enter in the case of plugin listeners
nsCOMPtr<nsIStreamListener> listenerGrip(mFinalListener);
mFinalListener = nullptr;
listenerGrip->OnStopRequest(aRequest, aContext, aStatusCode);
listenerGrip->OnStopRequest(aRequest, aStatusCode);
}
// Return value doesn't matter
@@ -2261,7 +2260,7 @@ nsresult nsObjectLoadingContent::CloseChannel() {
if (listenerGrip) {
// mFinalListener is only set by LoadObject after OnStartRequest, or
// by OnStartRequest in the case of late-opened plugin streams
listenerGrip->OnStopRequest(channelGrip, nullptr, NS_BINDING_ABORTED);
listenerGrip->OnStopRequest(channelGrip, NS_BINDING_ABORTED);
}
}
return NS_OK;

10
dom/base/nsSyncLoadService.cpp
View File

@@ -101,9 +101,9 @@ nsForceXMLListener::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP
nsForceXMLListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
nsForceXMLListener::OnStopRequest(nsIRequest *aRequest,
nsresult aStatusCode) {
return mListener->OnStopRequest(aRequest, aContext, aStatusCode);
return mListener->OnStopRequest(aRequest, aStatusCode);
}
nsSyncLoader::~nsSyncLoader() {
@@ -244,12 +244,12 @@ nsSyncLoader::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP
nsSyncLoader::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
nsSyncLoader::OnStopRequest(nsIRequest *aRequest,
nsresult aStatusCode) {
if (NS_SUCCEEDED(mAsyncLoadStatus) && NS_FAILED(aStatusCode)) {
mAsyncLoadStatus = aStatusCode;
}
nsresult rv = mListener->OnStopRequest(aRequest, aContext, aStatusCode);
nsresult rv = mListener->OnStopRequest(aRequest, aStatusCode);
if (NS_SUCCEEDED(mAsyncLoadStatus) && NS_FAILED(rv)) {
mAsyncLoadStatus = rv;
}
@@ -357,7 +357,7 @@ nsresult nsSyncLoadService::PushSyncStreamToListener(
if (NS_FAILED(rv)) {
aChannel->Cancel(rv);
}
aListener->OnStopRequest(aChannel, nullptr, rv);
aListener->OnStopRequest(aChannel, rv);
return rv;
}

5
dom/fetch/FetchDriver.cpp
View File

@@ -273,7 +273,6 @@ AlternativeDataStreamListener::OnDataAvailable(nsIRequest* aRequest,
NS_IMETHODIMP
AlternativeDataStreamListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatusCode) {
AssertIsOnMainThread();
@@ -288,7 +287,7 @@ AlternativeDataStreamListener::OnStopRequest(nsIRequest* aRequest,
if (mStatus == AlternativeDataStreamListener::FALLBACK) {
MOZ_ASSERT(fetchDriver);
return fetchDriver->OnStopRequest(aRequest, aContext, aStatusCode);
return fetchDriver->OnStopRequest(aRequest, aStatusCode);
}
MOZ_DIAGNOSTIC_ASSERT(mStatus == AlternativeDataStreamListener::LOADING);
@@ -1188,7 +1187,7 @@ FetchDriver::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
}
NS_IMETHODIMP
FetchDriver::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
FetchDriver::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
AssertIsOnMainThread();

1
dom/file/MutableBlobStreamListener.cpp
View File

@@ -50,7 +50,6 @@ MutableBlobStreamListener::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
MutableBlobStreamListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatus) {
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(mStorage);

3
dom/html/HTMLMediaElement.cpp
View File

@@ -699,10 +699,9 @@ HTMLMediaElement::MediaLoadListener::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
HTMLMediaElement::MediaLoadListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatus) {
if (mNextListener) {
return mNextListener->OnStopRequest(aRequest, aContext, aStatus);
return mNextListener->OnStopRequest(aRequest, aStatus);
}
return NS_OK;
}

4
dom/html/ImageDocument.cpp
View File

@@ -128,13 +128,13 @@ ImageListener::OnStartRequest(nsIRequest* request) {
}
NS_IMETHODIMP
ImageListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aCtxt,
ImageListener::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
ImageDocument* imgDoc = static_cast<ImageDocument*>(mDocument.get());
nsContentUtils::DispatchChromeEvent(imgDoc, ToSupports(imgDoc),
NS_LITERAL_STRING("ImageContentLoaded"),
CanBubble::eYes, Cancelable::eYes);
return MediaDocumentStreamListener::OnStopRequest(aRequest, aCtxt, aStatus);
return MediaDocumentStreamListener::OnStopRequest(aRequest, aStatus);
}
ImageDocument::ImageDocument()

4
dom/html/MediaDocument.cpp
View File

@@ -63,10 +63,10 @@ MediaDocumentStreamListener::OnStartRequest(nsIRequest* request) {
NS_IMETHODIMP
MediaDocumentStreamListener::OnStopRequest(nsIRequest* request,
nsISupports* ctxt, nsresult status) {
nsresult status) {
nsresult rv = NS_OK;
if (mNextStream) {
rv = mNextStream->OnStopRequest(request, ctxt, status);
rv = mNextStream->OnStopRequest(request, status);
}
// Don't release mDocument here if we're in the middle of a multipart

6
dom/jsurl/nsJSProtocolHandler.cpp
View File

@@ -738,7 +738,7 @@ void nsJSChannel::EvaluateScript() {
void nsJSChannel::NotifyListener() {
mListener->OnStartRequest(this);
mListener->OnStopRequest(this, nullptr, mStatus);
mListener->OnStopRequest(this, mStatus);
CleanupStrongRefs();
}
@@ -954,7 +954,7 @@ nsJSChannel::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
}
NS_IMETHODIMP
nsJSChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsJSChannel::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
NS_ENSURE_TRUE(aRequest == mStreamChannel, NS_ERROR_UNEXPECTED);
@@ -967,7 +967,7 @@ nsJSChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
aStatus = mStatus;
}
nsresult rv = listener->OnStopRequest(this, aContext, aStatus);
nsresult rv = listener->OnStopRequest(this, aStatus);
nsCOMPtr<nsILoadGroup> loadGroup;
mStreamChannel->GetLoadGroup(getter_AddRefs(loadGroup));

1
dom/media/ChannelMediaResource.cpp
View File

@@ -60,7 +60,6 @@ nsresult ChannelMediaResource::Listener::OnStartRequest(nsIRequest* aRequest) {
}
nsresult ChannelMediaResource::Listener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatus) {
MOZ_ASSERT(NS_IsMainThread());
if (!mResource) return NS_OK;

2
dom/media/WebVTTListener.cpp
View File

@@ -84,7 +84,7 @@ WebVTTListener::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
WebVTTListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
WebVTTListener::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
VTT_LOG("WebVTTListener::OnStopRequest\n");
if (NS_FAILED(aStatus)) {

4
dom/network/TCPSocket.cpp
View File

@@ -324,7 +324,7 @@ CopierCallbacks::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
CopierCallbacks::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
CopierCallbacks::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
mOwner->NotifyCopyComplete(aStatus);
mOwner = nullptr;
@@ -994,7 +994,7 @@ TCPSocket::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
}
NS_IMETHODIMP
TCPSocket::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
TCPSocket::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
mInputStreamPump = nullptr;

1
dom/plugins/base/nsPluginStreamListenerPeer.cpp
View File

@@ -310,7 +310,6 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(
}
NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest* request,
nsISupports* aContext,
nsresult aStatus) {
nsresult rv = NS_OK;

3
dom/presentation/PresentationTCPSessionTransport.cpp
View File

@@ -49,7 +49,7 @@ CopierCallbacks::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
CopierCallbacks::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
CopierCallbacks::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
mOwner->NotifyCopyComplete(aStatus);
return NS_OK;
@@ -510,7 +510,6 @@ PresentationTCPSessionTransport::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
PresentationTCPSessionTransport::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatusCode) {
PRES_DEBUG("%s:aStatusCode[%" PRIx32 "]\n", __func__,
static_cast<uint32_t>(aStatusCode));

10
dom/security/ContentVerifier.cpp
View File

@@ -86,7 +86,7 @@ void ContentVerifier::FinishSignature() {
// ContentSignatureVerifier on destruction.
if (NS_FAILED(mVerifier->End(&verified)) || !verified) {
CSV_LOG(("failed to verify content\n"));
(void)nextListener->OnStopRequest(mContentRequest, mContentContext,
(void)nextListener->OnStopRequest(mContentRequest,
NS_ERROR_INVALID_SIGNATURE);
return;
}
@@ -111,7 +111,7 @@ void ContentVerifier::FinishSignature() {
}
// propagate OnStopRequest and return
nextListener->OnStopRequest(mContentRequest, mContentContext, rv);
nextListener->OnStopRequest(mContentRequest, rv);
}
NS_IMETHODIMP
@@ -121,7 +121,7 @@ ContentVerifier::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
ContentVerifier::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
ContentVerifier::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
// If we don't have a next listener, we handed off this request already.
// Return, there's nothing to do here.
@@ -133,7 +133,7 @@ ContentVerifier::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
CSV_LOG(("Stream failed\n"));
nsCOMPtr<nsIStreamListener> nextListener;
nextListener.swap(mNextListener);
return nextListener->OnStopRequest(aRequest, aContext, aStatus);
return nextListener->OnStopRequest(aRequest, aStatus);
}
mContentRead = true;
@@ -189,7 +189,7 @@ ContentVerifier::ContextCreated(bool successful) {
if (mContentRequest && nextListener) {
mContentRequest->Cancel(NS_ERROR_INVALID_SIGNATURE);
nsresult rv = nextListener->OnStopRequest(
mContentRequest, mContentContext, NS_ERROR_INVALID_SIGNATURE);
mContentRequest, NS_ERROR_INVALID_SIGNATURE);
mContentRequest = nullptr;
mContentContext = nullptr;
return rv;

1
dom/security/nsCSPContext.cpp
View File

@@ -1606,7 +1606,6 @@ CSPViolationReportListener::OnDataAvailable(nsIRequest* aRequest,
NS_IMETHODIMP
CSPViolationReportListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatus) {
return NS_OK;
}

2
dom/serviceworkers/ServiceWorkerScriptCache.cpp
View File

@@ -843,7 +843,7 @@ nsresult CompareNetwork::SetPrincipalInfo(nsIChannel* aChannel) {
}
NS_IMETHODIMP
CompareNetwork::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
CompareNetwork::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
// Nothing to do here!
return NS_OK;

1
dom/webbrowserpersist/nsWebBrowserPersist.cpp
View File

@@ -829,7 +829,6 @@ NS_IMETHODIMP nsWebBrowserPersist::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP nsWebBrowserPersist::OnStopRequest(nsIRequest *request,
nsISupports *ctxt,
nsresult status) {
nsCOMPtr<nsISupports> keyPtr = do_QueryInterface(request);
OutputData *data = mOutputMap.Get(keyPtr);

2
dom/workers/ScriptLoader.cpp
View File

@@ -535,7 +535,7 @@ class LoaderListener final : public nsIStreamLoaderObserver,
OnStartRequest(nsIRequest* aRequest) override;
NS_IMETHOD
OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) override {
// Nothing to do here!
return NS_OK;

4
dom/xbl/nsXBLService.cpp
View File

@@ -212,11 +212,11 @@ nsXBLStreamListener::OnStartRequest(nsIRequest* request) {
}
NS_IMETHODIMP
nsXBLStreamListener::OnStopRequest(nsIRequest* request, nsISupports* aCtxt,
nsXBLStreamListener::OnStopRequest(nsIRequest* request,
nsresult aStatus) {
nsresult rv = NS_OK;
if (mInner) {
rv = mInner->OnStopRequest(request, aCtxt, aStatus);
rv = mInner->OnStopRequest(request, aStatus);
}
// Don't hold onto the inner listener; holding onto it can create a cycle

8
dom/xhr/XMLHttpRequestMainThread.cpp
View File

@@ -2021,7 +2021,7 @@ XMLHttpRequestMainThread::OnStartRequest(nsIRequest* request) {
}
NS_IMETHODIMP
XMLHttpRequestMainThread::OnStopRequest(nsIRequest* request, nsISupports* ctxt,
XMLHttpRequestMainThread::OnStopRequest(nsIRequest* request,
nsresult status) {
AUTO_PROFILER_LABEL("XMLHttpRequestMainThread::OnStopRequest", NETWORK);
@@ -2044,7 +2044,7 @@ XMLHttpRequestMainThread::OnStopRequest(nsIRequest* request, nsISupports* ctxt,
if (mRequestObserver) {
NS_ASSERTION(mFirstStartRequestSeen, "Inconsistent state!");
mFirstStartRequestSeen = false;
mRequestObserver->OnStopRequest(request, ctxt, status);
mRequestObserver->OnStopRequest(request, status);
}
// make sure to notify the listener if we were aborted
@@ -2052,13 +2052,13 @@ XMLHttpRequestMainThread::OnStopRequest(nsIRequest* request, nsISupports* ctxt,
// UNSENT is for abort calls. See OnStartRequest above.
if (mState == XMLHttpRequest_Binding::UNSENT || mFlagTimedOut) {
if (mXMLParserStreamListener)
(void)mXMLParserStreamListener->OnStopRequest(request, ctxt, status);
(void)mXMLParserStreamListener->OnStopRequest(request, status);
return NS_OK;
}
// Is this good enough here?
if (mXMLParserStreamListener && mFlagParseBody) {
mXMLParserStreamListener->OnStopRequest(request, ctxt, status);
mXMLParserStreamListener->OnStopRequest(request, status);
}
mXMLParserStreamListener = nullptr;

4
dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
View File

@@ -269,7 +269,7 @@ txStylesheetSink::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
txStylesheetSink::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
txStylesheetSink::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
bool success = true;
@@ -299,7 +299,7 @@ txStylesheetSink::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
mCompiler->cancel(result, nullptr, spec.get());
}
nsresult rv = mListener->OnStopRequest(aRequest, mParser, aStatusCode);
nsresult rv = mListener->OnStopRequest(aRequest, aStatusCode);
mListener = nullptr;
mParser = nullptr;
return rv;

1
dom/xul/XULDocument.cpp
View File

@@ -1379,7 +1379,6 @@ XULDocument::CachedChromeStreamListener::OnStartRequest(nsIRequest* request) {
NS_IMETHODIMP
XULDocument::CachedChromeStreamListener::OnStopRequest(nsIRequest* request,
nsISupports* aContext,
nsresult aStatus) {
if (!mProtoLoaded) return NS_OK;

2
extensions/pref/autoconfig/src/nsAutoConfig.cpp
View File

@@ -85,7 +85,7 @@ nsAutoConfig::OnDataAvailable(nsIRequest *request, nsISupports *context,
}
NS_IMETHODIMP
nsAutoConfig::OnStopRequest(nsIRequest *request, nsISupports *context,
nsAutoConfig::OnStopRequest(nsIRequest *request,
nsresult aStatus) {
nsresult rv;

2
gfx/thebes/gfxSVGGlyphs.cpp
View File

@@ -379,7 +379,7 @@ nsresult gfxSVGGlyphsDocument::ParseDocument(const uint8_t *aBuffer,
channel->GetStatus(&status);
}
rv = listener->OnStopRequest(channel, nullptr /* aContext */, status);
rv = listener->OnStopRequest(channel, status);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
document.swap(mDocument);

4
image/SVGDocumentWrapper.cpp
View File

@@ -215,10 +215,10 @@ SVGDocumentWrapper::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
SVGDocumentWrapper::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
SVGDocumentWrapper::OnStopRequest(nsIRequest* aRequest,
nsresult status) {
if (mListener) {
mListener->OnStopRequest(aRequest, ctxt, status);
mListener->OnStopRequest(aRequest, status);
mListener = nullptr;
}

6
image/VectorImage.cpp
View File

@@ -425,7 +425,7 @@ nsresult VectorImage::OnImageDataComplete(nsIRequest* aRequest,
nsresult aStatus, bool aLastPart) {
// Call our internal OnStopRequest method, which only talks to our embedded
// SVG document. This won't have any effect on our ProgressTracker.
nsresult finalStatus = OnStopRequest(aRequest, aContext, aStatus);
nsresult finalStatus = OnStopRequest(aRequest, aStatus);
// Give precedence to Necko failure codes.
if (NS_FAILED(aStatus)) {
@@ -1367,13 +1367,13 @@ VectorImage::OnStartRequest(nsIRequest* aRequest) {
//******************************************************************************
NS_IMETHODIMP
VectorImage::OnStopRequest(nsIRequest* aRequest, nsISupports* aCtxt,
VectorImage::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
if (mError) {
return NS_ERROR_FAILURE;
}
return mSVGDocumentWrapper->OnStopRequest(aRequest, aCtxt, aStatus);
return mSVGDocumentWrapper->OnStopRequest(aRequest, aStatus);
}
void VectorImage::OnSVGDocumentParsed() {

4
image/decoders/icon/mac/nsIconChannelCocoa.mm
View File

@@ -82,9 +82,9 @@ nsIconChannel::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
nsIconChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, nsresult aStatus) {
nsIconChannel::OnStopRequest(nsIRequest* aRequest, nsresult aStatus) {
if (mListener) {
mListener->OnStopRequest(this, aContext, aStatus);
mListener->OnStopRequest(this, aStatus);
mListener = nullptr;
}

4
image/decoders/icon/win/nsIconChannel.cpp
View File

@@ -714,10 +714,10 @@ NS_IMETHODIMP nsIconChannel::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
nsIconChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsIconChannel::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
if (mListener) {
mListener->OnStopRequest(this, aContext, aStatus);
mListener->OnStopRequest(this, aStatus);
mListener = nullptr;
}

8
image/imgLoader.cpp
View File

@@ -2690,13 +2690,13 @@ ProxyListener::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
ProxyListener::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
ProxyListener::OnStopRequest(nsIRequest* aRequest,
nsresult status) {
if (!mDestListener) {
return NS_ERROR_FAILURE;
}
return mDestListener->OnStopRequest(aRequest, ctxt, status);
return mDestListener->OnStopRequest(aRequest, status);
}
/** nsIStreamListener methods **/
@@ -2916,7 +2916,7 @@ imgCacheValidator::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
imgCacheValidator::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
imgCacheValidator::OnStopRequest(nsIRequest* aRequest,
nsresult status) {
// Be sure we've released the document that we may have been holding on to.
mContext = nullptr;
@@ -2925,7 +2925,7 @@ imgCacheValidator::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
return NS_OK;
}
return mDestListener->OnStopRequest(aRequest, ctxt, status);
return mDestListener->OnStopRequest(aRequest, status);
}
/** nsIStreamListener methods **/

6
image/imgRequest.cpp
View File

@@ -735,7 +735,7 @@ imgRequest::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
imgRequest::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
imgRequest::OnStopRequest(nsIRequest* aRequest,
nsresult status) {
LOG_FUNC(gImgLog, "imgRequest::OnStopRequest");
MOZ_ASSERT(NS_IsMainThread(), "Can't send notifications off-main-thread");
@@ -745,7 +745,7 @@ imgRequest::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
RefPtr<imgRequest> strongThis = this;
if (mIsMultiPartChannel && mNewPartPending) {
OnDataAvailable(aRequest, ctxt, nullptr, 0, 0);
OnDataAvailable(aRequest, nullptr, nullptr, 0, 0);
}
// XXXldb What if this is a non-last part of a multipart request?
@@ -779,7 +779,7 @@ imgRequest::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
// trigger a failure, since the image might be waiting for more non-optional
// data and this is the point where we break the news that it's not coming.
if (image) {
nsresult rv = image->OnImageDataComplete(aRequest, ctxt, status, lastPart);
nsresult rv = image->OnImageDataComplete(aRequest, nullptr, status, lastPart);
// If we got an error in the OnImageDataComplete() call, we don't want to
// proceed as if nothing bad happened. However, we also want to give

2
layout/style/StreamLoader.cpp
View File

@@ -47,7 +47,7 @@ StreamLoader::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
StreamLoader::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
StreamLoader::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
// Decoded data
nsCString utf8String;

2
layout/style/nsFontFaceLoader.cpp
View File

@@ -310,7 +310,7 @@ nsFontFaceLoader::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
nsFontFaceLoader::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsFontFaceLoader::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
MOZ_ASSERT(NS_IsMainThread());
DropChannel();

2
media/mtransport/ipc/WebrtcProxyChannel.cpp
View File

@@ -338,7 +338,7 @@ WebrtcProxyChannel::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
WebrtcProxyChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
WebrtcProxyChannel::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
LOG(("WebrtcProxyChannel::OnStopRequest %p status=%u\n", this,
static_cast<uint32_t>(aStatusCode)));

6
modules/libjar/nsJARChannel.cpp
View File

@@ -531,7 +531,7 @@ void nsJARChannel::NotifyError(nsresult aError) {
mStatus = aError;
OnStartRequest(nullptr);
OnStopRequest(nullptr, nullptr, aError);
OnStopRequest(nullptr, aError);
}
void nsJARChannel::FireOnProgress(uint64_t aProgress) {
@@ -1015,7 +1015,7 @@ nsJARChannel::OnStartRequest(nsIRequest *req) {
}
NS_IMETHODIMP
nsJARChannel::OnStopRequest(nsIRequest *req, nsISupports *ctx,
nsJARChannel::OnStopRequest(nsIRequest *req,
nsresult status) {
LOG(("nsJARChannel::OnStopRequest [this=%p %s status=%" PRIx32 "]\n", this,
mSpec.get(), static_cast<uint32_t>(status)));
@@ -1023,7 +1023,7 @@ nsJARChannel::OnStopRequest(nsIRequest *req, nsISupports *ctx,
if (NS_SUCCEEDED(mStatus)) mStatus = status;
if (mListener) {
mListener->OnStopRequest(this, nullptr, status);
mListener->OnStopRequest(this, status);
mListener = nullptr;
}

5
modules/libjar/zipwriter/nsDeflateConverter.cpp
View File

@@ -132,7 +132,6 @@ NS_IMETHODIMP nsDeflateConverter::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP nsDeflateConverter::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode) {
if (!mListener) return NS_ERROR_NOT_INITIALIZED;
@@ -141,13 +140,13 @@ NS_IMETHODIMP nsDeflateConverter::OnStopRequest(nsIRequest *aRequest,
int zerr;
do {
zerr = deflate(&mZstream, Z_FINISH);
rv = PushAvailableData(aRequest, aContext);
rv = PushAvailableData(aRequest, nullptr);
NS_ENSURE_SUCCESS(rv, rv);
} while (zerr == Z_OK);
deflateEnd(&mZstream);
return mListener->OnStopRequest(aRequest, mContext, aStatusCode);
return mListener->OnStopRequest(aRequest, aStatusCode);
}
nsresult nsDeflateConverter::PushAvailableData(nsIRequest *aRequest,

9
modules/libjar/zipwriter/nsZipDataStream.cpp
View File

@@ -78,11 +78,10 @@ NS_IMETHODIMP nsZipDataStream::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP nsZipDataStream::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode) {
if (!mOutput) return NS_ERROR_NOT_INITIALIZED;
nsresult rv = mOutput->OnStopRequest(aRequest, aContext, aStatusCode);
nsresult rv = mOutput->OnStopRequest(aRequest, aStatusCode);
mOutput = nullptr;
if (NS_FAILED(rv)) {
mWriter->EntryCompleteCallback(mHeader, rv);
@@ -143,19 +142,19 @@ nsresult nsZipDataStream::ReadStream(nsIInputStream *aStream) {
do {
rv = aStream->Read(buffer.get(), 4096, &read);
if (NS_FAILED(rv)) {
OnStopRequest(nullptr, nullptr, rv);
OnStopRequest(nullptr, rv);
return rv;
}
if (read > 0) {
rv = ProcessData(nullptr, nullptr, buffer.get(), offset, read);
if (NS_FAILED(rv)) {
OnStopRequest(nullptr, nullptr, rv);
OnStopRequest(nullptr, rv);
return rv;
}
offset += read;
}
} while (read > 0);
return OnStopRequest(nullptr, nullptr, NS_OK);
return OnStopRequest(nullptr, NS_OK);
}

4
modules/libjar/zipwriter/nsZipWriter.cpp
View File

@@ -625,7 +625,6 @@ NS_IMETHODIMP nsZipWriter::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP nsZipWriter::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode) {
if (NS_FAILED(aStatusCode)) {
FinishQueue(aStatusCode);
@@ -1030,12 +1029,11 @@ void nsZipWriter::BeginProcessingNextItem() {
*/
void nsZipWriter::FinishQueue(nsresult aStatus) {
nsCOMPtr<nsIRequestObserver> observer = mProcessObserver;
nsCOMPtr<nsISupports> context = mProcessContext;
// Clean up everything first in case the observer decides to queue more
// things
mProcessObserver = nullptr;
mProcessContext = nullptr;
mInQueue = false;
if (observer) observer->OnStopRequest(nullptr, context, aStatus);
if (observer) observer->OnStopRequest(nullptr, aStatus);
}

1
netwerk/base/BackgroundFileSaver.cpp
View File

@@ -974,7 +974,6 @@ BackgroundFileSaverStreamListener::OnStartRequest(nsIRequest *aRequest) {
NS_IMETHODIMP
BackgroundFileSaverStreamListener::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode) {
// If an error occurred, cancel the operation immediately. On success, wait
// until the caller has determined whether the file should be renamed.

4
netwerk/base/MemoryDownloader.cpp
View File

@@ -25,7 +25,7 @@ MemoryDownloader::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
MemoryDownloader::OnStopRequest(nsIRequest* aRequest, nsISupports* aCtxt,
MemoryDownloader::OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) {
MOZ_ASSERT_IF(NS_FAILED(mStatus), NS_FAILED(aStatus));
MOZ_ASSERT(!mData == NS_FAILED(mStatus));
@@ -33,7 +33,7 @@ MemoryDownloader::OnStopRequest(nsIRequest* aRequest, nsISupports* aCtxt,
data.swap(mData);
RefPtr<IObserver> observer;
observer.swap(mObserver);
observer->OnDownloadComplete(this, aRequest, aCtxt, aStatus, std::move(data));
observer->OnDownloadComplete(this, aRequest, nullptr, aStatus, std::move(data));
return NS_OK;
}

1
netwerk/base/NetworkConnectivityService.cpp
View File

@@ -257,7 +257,6 @@ NetworkConnectivityService::OnStartRequest(nsIRequest *aRequest) {
NS_IMETHODIMP
NetworkConnectivityService::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode) {
if (aStatusCode == NS_ERROR_ABORT) {
return NS_OK;

1
netwerk/base/Predictor.cpp
View File

@@ -2329,7 +2329,6 @@ Predictor::PrefetchListener::OnStartRequest(nsIRequest *aRequest) {
NS_IMETHODIMP
Predictor::PrefetchListener::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode) {
PREDICTOR_LOG(("OnStopRequest this=%p aStatusCode=0x%" PRIX32, this,
static_cast<uint32_t>(aStatusCode)));

2
netwerk/base/SimpleChannelParent.cpp
View File

@@ -85,7 +85,7 @@ SimpleChannelParent::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
SimpleChannelParent::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
SimpleChannelParent::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
// See above.
MOZ_ASSERT(NS_FAILED(aStatusCode));

2
netwerk/base/nsAsyncStreamCopier.cpp
View File

@@ -112,7 +112,7 @@ void nsAsyncStreamCopier::Complete(nsresult status) {
if (observer) {
LOG((" calling OnStopRequest [status=%" PRIx32 "]\n",
static_cast<uint32_t>(status)));
observer->OnStopRequest(AsRequest(), ctx, status);
observer->OnStopRequest(AsRequest(), status);
}
}

6
netwerk/base/nsBaseChannel.cpp
View File

@@ -282,7 +282,7 @@ void nsBaseChannel::ContinueHandleAsyncRedirect(nsresult result) {
if (NS_FAILED(result) && mListener) {
// Notify our consumer ourselves
mListener->OnStartRequest(this);
mListener->OnStopRequest(this, nullptr, mStatus);
mListener->OnStopRequest(this, mStatus);
ChannelDone();
}
@@ -765,7 +765,7 @@ nsBaseChannel::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsBaseChannel::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsBaseChannel::OnStopRequest(nsIRequest *request,
nsresult status) {
// If both mStatus and status are failure codes, we keep mStatus as-is since
// that is consistent with our GetStatus and Cancel methods.
@@ -777,7 +777,7 @@ nsBaseChannel::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
mPumpingData = false;
if (mListener) // null in case of redirect
mListener->OnStopRequest(this, nullptr, mStatus);
mListener->OnStopRequest(this, mStatus);
ChannelDone();
// No need to suspend pump in this scope since we will not be receiving

4
netwerk/base/nsDownloader.cpp
View File

@@ -67,14 +67,14 @@ nsDownloader::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsDownloader::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsDownloader::OnStopRequest(nsIRequest *request,
nsresult status) {
if (mSink) {
mSink->Close();
mSink = nullptr;
}
mObserver->OnDownloadComplete(this, request, ctxt, status, mLocation);
mObserver->OnDownloadComplete(this, request, nullptr, status, mLocation);
mObserver = nullptr;
return NS_OK;

2
netwerk/base/nsIRequestObserver.idl
View File

@@ -28,12 +28,10 @@ interface nsIRequestObserver : nsISupports
* call is always preceded by a call to onStartRequest.
*
* @param aRequest request being observed
* @param aContext user defined context
* @param aStatusCode reason for stopping (NS_OK if completed successfully)
*
* An exception thrown from onStopRequest is generally ignored.
*/
void onStopRequest(in nsIRequest aRequest,
in nsISupports aContext,
in nsresult aStatusCode);
};

4
netwerk/base/nsIncrementalDownload.cpp
View File

@@ -194,7 +194,7 @@ void nsIncrementalDownload::CallOnStopRequest() {
mIsPending = false;
mObserver->OnStopRequest(this, mObserverContext, mStatus);
mObserver->OnStopRequest(this, mStatus);
mObserver = nullptr;
mObserverContext = nullptr;
}
@@ -637,7 +637,7 @@ nsIncrementalDownload::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsIncrementalDownload::OnStopRequest(nsIRequest *request, nsISupports *context,
nsIncrementalDownload::OnStopRequest(nsIRequest *request,
nsresult status) {
// Not a real error; just a trick to kill off the channel without our
// listener having to care.

3
netwerk/base/nsIncrementalStreamLoader.cpp
View File

@@ -76,7 +76,7 @@ nsIncrementalStreamLoader::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsIncrementalStreamLoader::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsIncrementalStreamLoader::OnStopRequest(nsIRequest *request,
nsresult aStatus) {
AUTO_PROFILER_LABEL("nsIncrementalStreamLoader::OnStopRequest", NETWORK);
@@ -97,7 +97,6 @@ nsIncrementalStreamLoader::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
ReleaseData();
mRequest = nullptr;
mObserver = nullptr;
mContext = nullptr;
}
return NS_OK;
}

2
netwerk/base/nsInputStreamPump.cpp
View File

@@ -652,7 +652,7 @@ uint32_t nsInputStreamPump::OnStateStop() {
// deadlocks when calls to RetargetDeliveryTo for multiple
// nsInputStreamPumps are needed (e.g. nsHttpChannel).
RecursiveMutexAutoUnlock unlock(mMutex);
mListener->OnStopRequest(this, nullptr, mStatus);
mListener->OnStopRequest(this, mStatus);
}
mListener = nullptr;

2
netwerk/base/nsLoadGroup.cpp
View File

@@ -572,7 +572,7 @@ nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports *ctxt,
"(foreground count=%d).\n",
this, request, mForegroundCount));
rv = observer->OnStopRequest(request, ctxt, aStatus);
rv = observer->OnStopRequest(request, aStatus);
if (NS_FAILED(rv)) {
LOG(("LOADGROUP [%p]: OnStopRequest for request %p FAILED.\n", this,

5
netwerk/base/nsRequestObserverProxy.cpp
View File

@@ -100,7 +100,7 @@ class nsOnStopRequestEvent : public nsARequestObserverEvent {
NS_ASSERTION(NS_SUCCEEDED(rv), "GetStatus failed for request!");
LOG(("handle stopevent=%p\n", this));
(void)observer->OnStopRequest(mRequest, mProxy->mContext, status);
(void)observer->OnStopRequest(mRequest, status);
return NS_OK;
}
@@ -132,9 +132,8 @@ nsRequestObserverProxy::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsRequestObserverProxy::OnStopRequest(nsIRequest *request, nsISupports *context,
nsRequestObserverProxy::OnStopRequest(nsIRequest *request,
nsresult status) {
MOZ_ASSERT(!context || context == mContext);
LOG(("nsRequestObserverProxy: OnStopRequest [this=%p req=%p status=%" PRIx32
"]\n",
this, request, static_cast<uint32_t>(status)));

4
netwerk/base/nsSimpleStreamListener.cpp
View File

@@ -28,8 +28,8 @@ nsSimpleStreamListener::OnStartRequest(nsIRequest *aRequest) {
NS_IMETHODIMP
nsSimpleStreamListener::OnStopRequest(nsIRequest *request,
nsISupports *aContext, nsresult aStatus) {
return mObserver ? mObserver->OnStopRequest(request, aContext, aStatus)
nsresult aStatus) {
return mObserver ? mObserver->OnStopRequest(request, aStatus)
: NS_OK;
}

6
netwerk/base/nsStreamListenerTee.cpp
View File

@@ -23,7 +23,7 @@ nsStreamListenerTee::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsStreamListenerTee::OnStopRequest(nsIRequest *request, nsISupports *context,
nsStreamListenerTee::OnStopRequest(nsIRequest *request,
nsresult status) {
NS_ENSURE_TRUE(mListener, NS_ERROR_NOT_INITIALIZED);
// it is critical that we close out the input stream tee
@@ -39,8 +39,8 @@ nsStreamListenerTee::OnStopRequest(nsIRequest *request, nsISupports *context,
mSink = nullptr;
}
nsresult rv = mListener->OnStopRequest(request, context, status);
if (mObserver) mObserver->OnStopRequest(request, context, status);
nsresult rv = mListener->OnStopRequest(request, status);
if (mObserver) mObserver->OnStopRequest(request, status);
mObserver = nullptr;
return rv;
}

5
netwerk/base/nsStreamLoader.cpp
View File

@@ -80,7 +80,7 @@ nsStreamLoader::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsStreamLoader::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsStreamLoader::OnStopRequest(nsIRequest *request,
nsresult aStatus) {
AUTO_PROFILER_LABEL("nsStreamLoader::OnStopRequest", NETWORK);
@@ -100,11 +100,10 @@ nsStreamLoader::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
ReleaseData();
mRequest = nullptr;
mObserver = nullptr;
mContext = nullptr;
}
if (mRequestObserver) {
mRequestObserver->OnStopRequest(request, ctxt, aStatus);
mRequestObserver->OnStopRequest(request, aStatus);
mRequestObserver = nullptr;
}

2
netwerk/base/nsSyncStreamListener.cpp
View File

@@ -87,7 +87,7 @@ nsSyncStreamListener::OnDataAvailable(nsIRequest *request, nsISupports *context,
}
NS_IMETHODIMP
nsSyncStreamListener::OnStopRequest(nsIRequest *request, nsISupports *context,
nsSyncStreamListener::OnStopRequest(nsIRequest *request,
nsresult status) {
mStatus = status;
mKeepWaiting = false; // unblock Read

2
netwerk/dns/TRR.cpp
View File

@@ -966,7 +966,7 @@ nsresult TRR::On200Response() {
}
NS_IMETHODIMP
TRR::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
TRR::OnStopRequest(nsIRequest *aRequest,
nsresult aStatusCode) {
// The dtor will be run after the function returns
LOG(("TRR:OnStopRequest %p %s %d failed=%d code=%X\n", this, mHost.get(),

2
netwerk/protocol/about/nsAboutCacheEntry.cpp
View File

@@ -538,7 +538,7 @@ nsAboutCacheEntry::Channel::OnDataAvailable(nsIRequest *request,
}
NS_IMETHODIMP
nsAboutCacheEntry::Channel::OnStopRequest(nsIRequest *request, nsISupports *ctx,
nsAboutCacheEntry::Channel::OnStopRequest(nsIRequest *request,
nsresult result) {
NS_NAMED_LITERAL_CSTRING(buffer, "</pre>\n");
uint32_t n;

2
netwerk/protocol/data/DataChannelParent.cpp
View File

@@ -85,7 +85,7 @@ DataChannelParent::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP
DataChannelParent::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
DataChannelParent::OnStopRequest(nsIRequest *aRequest,
nsresult aStatusCode) {
// See above.
MOZ_ASSERT(NS_FAILED(aStatusCode));

2
netwerk/protocol/file/FileChannelParent.cpp
View File

@@ -85,7 +85,7 @@ FileChannelParent::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP
FileChannelParent::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
FileChannelParent::OnStopRequest(nsIRequest *aRequest,
nsresult aStatusCode) {
// See above.
MOZ_ASSERT(NS_FAILED(aStatusCode));

4
netwerk/protocol/ftp/FTPChannelChild.cpp
View File

@@ -515,7 +515,7 @@ void FTPChannelChild::DoOnStopRequest(const nsresult& aChannelStatus,
// we initiate protocol deletion below.
mIsPending = false;
AutoEventEnqueuer ensureSerialDispatch(mEventQ);
(void)mListener->OnStopRequest(this, nullptr, aChannelStatus);
(void)mListener->OnStopRequest(this, aChannelStatus);
mListener = nullptr;
@@ -557,7 +557,7 @@ void FTPChannelChild::DoFailedAsyncOpen(const nsresult& statusCode) {
if (mListener) {
mListener->OnStartRequest(this);
mIsPending = false;
mListener->OnStopRequest(this, nullptr, statusCode);
mListener->OnStopRequest(this, statusCode);
} else {
mIsPending = false;
}

8
netwerk/protocol/ftp/FTPChannelParent.cpp
View File

@@ -333,7 +333,7 @@ void FTPChannelParent::DivertOnStopRequest(const nsresult& statusCode) {
}
AutoEventEnqueuer ensureSerialDispatch(mEventQ);
OnStopRequest(mChannel, nullptr, status);
OnStopRequest(mChannel, status);
}
class FTPDivertCompleteEvent : public MainThreadChannelEvent {
@@ -441,7 +441,7 @@ FTPChannelParent::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
FTPChannelParent::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
FTPChannelParent::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
LOG(("FTPChannelParent::OnStopRequest: [this=%p status=%" PRIu32 "]\n", this,
static_cast<uint32_t>(aStatusCode)));
@@ -449,7 +449,7 @@ FTPChannelParent::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
if (mDivertingFromChild) {
MOZ_RELEASE_ASSERT(mDivertToListener,
"Cannot divert if listener is unset!");
return mDivertToListener->OnStopRequest(aRequest, aContext, aStatusCode);
return mDivertToListener->OnStopRequest(aRequest, aStatusCode);
}
if (mIPCClosed || !SendOnStopRequest(aStatusCode, mErrorMsg, mUseUTF8)) {
@@ -809,7 +809,7 @@ void FTPChannelParent::NotifyDiversionFailed(nsresult aErrorCode,
// If the channel is pending, it will call OnStopRequest itself; otherwise, do
// it here.
if (!isPending) {
mDivertToListener->OnStopRequest(mChannel, nullptr, aErrorCode);
mDivertToListener->OnStopRequest(mChannel, aErrorCode);
}
mDivertToListener = nullptr;
mChannel = nullptr;

2
netwerk/protocol/ftp/nsFtpConnectionThread.cpp
View File

@@ -1802,7 +1802,7 @@ nsFtpState::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsFtpState::OnStopRequest(nsIRequest *request, nsISupports *context,
nsFtpState::OnStopRequest(nsIRequest *request,
nsresult status) {
mUploadRequest = nullptr;

2
netwerk/protocol/http/AlternateServices.cpp
View File

@@ -804,7 +804,7 @@ TransactionObserver::OnDataAvailable(nsIRequest *aRequest,
}
NS_IMETHODIMP
TransactionObserver::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
TransactionObserver::OnStopRequest(nsIRequest *aRequest,
nsresult code) {
MOZ_ASSERT(NS_IsMainThread());
LOG(("TransactionObserver onStopRequest %p code %" PRIx32 "\n", this,

6
netwerk/protocol/http/HttpBaseChannel.cpp
View File

@@ -1153,14 +1153,14 @@ class InterceptFailedOnStop : public nsIStreamListener {
return mNext->OnStartRequest(aRequest);
}
NS_IMETHOD OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
NS_IMETHOD OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) override {
if (NS_FAILED(aStatusCode) && NS_SUCCEEDED(mChannel->mStatus)) {
LOG(("HttpBaseChannel::InterceptFailedOnStop %p seting status %" PRIx32,
mChannel, static_cast<uint32_t>(aStatusCode)));
mChannel->mStatus = aStatusCode;
}
return mNext->OnStopRequest(aRequest, aContext, aStatusCode);
return mNext->OnStopRequest(aRequest, aStatusCode);
}
NS_IMETHOD OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
@@ -3308,7 +3308,7 @@ void HttpBaseChannel::DoNotifyListener() {
if (mListener && !mOnStopRequestCalled) {
nsCOMPtr<nsIStreamListener> listener = mListener;
listener->OnStopRequest(this, nullptr, mStatus);
listener->OnStopRequest(this, mStatus);
mOnStopRequestCalled = true;
}

5
netwerk/protocol/http/HttpChannelChild.cpp
View File

@@ -141,7 +141,6 @@ InterceptStreamListener::OnDataAvailable(nsIRequest* aRequest,
NS_IMETHODIMP
InterceptStreamListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatusCode) {
if (mOwner) {
mOwner->DoPreOnStopRequest(aStatusCode);
@@ -614,7 +613,7 @@ class SyntheticDiversionListener final : public nsIStreamListener {
}
NS_IMETHOD
OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
OnStopRequest(nsIRequest* aRequest,
nsresult aStatus) override {
if (mChannel->mIPCOpen) {
mChannel->SendDivertOnStopRequest(aStatus);
@@ -1228,7 +1227,7 @@ void HttpChannelChild::DoOnStopRequest(nsIRequest* aRequest,
// In theory mListener should not be null, but in practice sometimes it is.
MOZ_ASSERT(mListener);
if (mListener) {
mListener->OnStopRequest(aRequest, aContext, mStatus);
mListener->OnStopRequest(aRequest, mStatus);
}
mOnStopRequestCalled = true;

6
netwerk/protocol/http/HttpChannelParent.cpp
View File

@@ -1151,7 +1151,7 @@ void HttpChannelParent::DivertOnStopRequest(const nsresult& statusCode) {
}
AutoEventEnqueuer ensureSerialDispatch(mEventQ);
mParentListener->OnStopRequest(mChannel, nullptr, status);
mParentListener->OnStopRequest(mChannel, status);
}
class DivertCompleteEvent : public MainThreadChannelEvent {
@@ -1481,7 +1481,7 @@ HttpChannelParent::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
HttpChannelParent::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
HttpChannelParent::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
LOG(("HttpChannelParent::OnStopRequest: [this=%p aRequest=%p status=%" PRIx32
"]\n",
@@ -2338,7 +2338,7 @@ void HttpChannelParent::NotifyDiversionFailed(nsresult aErrorCode) {
// If the channel is pending, it will call OnStopRequest itself; otherwise, do
// it here.
if (!isPending) {
mParentListener->OnStopRequest(mChannel, nullptr, aErrorCode);
mParentListener->OnStopRequest(mChannel, aErrorCode);
}
if (!mIPCClosed) {

3
netwerk/protocol/http/HttpChannelParentListener.cpp
View File

@@ -83,7 +83,6 @@ HttpChannelParentListener::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
HttpChannelParentListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatusCode) {
MOZ_RELEASE_ASSERT(!mSuspendedForDiversion,
"Cannot call OnStopRequest if suspended for diversion!");
@@ -93,7 +92,7 @@ HttpChannelParentListener::OnStopRequest(nsIRequest* aRequest,
LOG(("HttpChannelParentListener::OnStopRequest: [this=%p status=%" PRIu32
"]\n",
this, static_cast<uint32_t>(aStatusCode)));
nsresult rv = mNextListener->OnStopRequest(aRequest, aContext, aStatusCode);
nsresult rv = mNextListener->OnStopRequest(aRequest, aStatusCode);
mNextListener = nullptr;
return rv;

4
netwerk/protocol/http/InterceptedHttpChannel.cpp
View File

@@ -1027,7 +1027,7 @@ InterceptedHttpChannel::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
InterceptedHttpChannel::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext, nsresult aStatus) {
nsresult aStatus) {
MOZ_ASSERT(NS_IsMainThread());
if (NS_SUCCEEDED(mStatus)) {
@@ -1048,7 +1048,7 @@ InterceptedHttpChannel::OnStopRequest(nsIRequest* aRequest,
MaybeReportTimingData();
if (mListener) {
mListener->OnStopRequest(this, nullptr, mStatus);
mListener->OnStopRequest(this, mStatus);
}
gHttpHandler->OnStopRequest(this);

5
netwerk/protocol/http/nsCORSListenerProxy.cpp
View File

@@ -603,7 +603,7 @@ nsresult nsCORSListenerProxy::CheckRequestApproved(nsIRequest* aRequest) {
}
NS_IMETHODIMP
nsCORSListenerProxy::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsCORSListenerProxy::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
MOZ_ASSERT(mInited, "nsCORSListenerProxy has not been initialized properly");
nsCOMPtr<nsIStreamListener> listener;
@@ -611,7 +611,7 @@ nsCORSListenerProxy::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
MutexAutoLock lock(mMutex);
listener = mOuterListener.forget();
}
nsresult rv = listener->OnStopRequest(aRequest, aContext, aStatusCode);
nsresult rv = listener->OnStopRequest(aRequest, aStatusCode);
mOuterNotificationCallbacks = nullptr;
mHttpChannel = nullptr;
return rv;
@@ -1234,7 +1234,6 @@ nsCORSPreflightListener::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
nsCORSPreflightListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatus) {
mCallback = nullptr;
return NS_OK;

4
netwerk/protocol/http/nsHttpChannel.cpp
View File

@@ -7535,7 +7535,7 @@ nsresult nsHttpChannel::ContinueOnStartRequest4(nsresult result) {
}
NS_IMETHODIMP
nsHttpChannel::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsHttpChannel::OnStopRequest(nsIRequest *request,
nsresult status) {
AUTO_PROFILER_LABEL("nsHttpChannel::OnStopRequest", NETWORK);
@@ -7943,7 +7943,7 @@ nsresult nsHttpChannel::ContinueOnStopRequest(nsresult aStatus, bool aIsFromNet,
MOZ_ASSERT(mOnStartRequestCalled,
"OnStartRequest should be called before OnStopRequest");
MOZ_ASSERT(!mOnStopRequestCalled, "We should not call OnStopRequest twice");
mListener->OnStopRequest(this, nullptr, aStatus);
mListener->OnStopRequest(this, aStatus);
mOnStopRequestCalled = true;
}

2
netwerk/protocol/res/ExtensionProtocolHandler.cpp
View File

@@ -237,7 +237,7 @@ static void CancelRequest(nsIStreamListener* aListener, nsIChannel* aChannel,
MOZ_ASSERT(aChannel);
aListener->OnStartRequest(aChannel);
aListener->OnStopRequest(aChannel, nullptr, aResult);
aListener->OnStopRequest(aChannel, aResult);
aChannel->Cancel(NS_BINDING_ABORTED);
}

4
netwerk/protocol/viewsource/nsViewSourceChannel.cpp
View File

@@ -635,7 +635,7 @@ nsViewSourceChannel::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP
nsViewSourceChannel::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
nsViewSourceChannel::OnStopRequest(nsIRequest *aRequest,
nsresult aStatus) {
NS_ENSURE_TRUE(mListener, NS_ERROR_FAILURE);
if (mChannel) {
@@ -647,7 +647,7 @@ nsViewSourceChannel::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
}
}
return mListener->OnStopRequest(static_cast<nsIViewSourceChannel *>(this),
aContext, aStatus);
aStatus);
}
// nsIStreamListener methods

2
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@@ -3847,7 +3847,7 @@ WebSocketChannel::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP
WebSocketChannel::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
WebSocketChannel::OnStopRequest(nsIRequest *aRequest,
nsresult aStatusCode) {
LOG(("WebSocketChannel::OnStopRequest() %p [%p %p %" PRIx32 "]\n", this,
aRequest, mHttpChannel.get(), static_cast<uint32_t>(aStatusCode)));

4
netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
View File

@@ -278,7 +278,7 @@ void WyciwygChannelChild::OnStopRequest(const nsresult& statusCode) {
if (!mCanceled) mStatus = statusCode;
mListener->OnStopRequest(this, nullptr, statusCode);
mListener->OnStopRequest(this, statusCode);
mListener = nullptr;
@@ -321,7 +321,7 @@ void WyciwygChannelChild::CancelEarly(const nsresult& statusCode) {
if (mListener) {
mListener->OnStartRequest(this);
mListener->OnStopRequest(this, nullptr, mStatus);
mListener->OnStopRequest(this, mStatus);
}
mListener = nullptr;

2
netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
View File

@@ -329,7 +329,7 @@ WyciwygChannelParent::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
WyciwygChannelParent::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
WyciwygChannelParent::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
LOG(("WyciwygChannelParent::OnStopRequest: [this=%p status=%" PRIu32 "]\n",
this, static_cast<uint32_t>(aStatusCode)));

6
netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
View File

@@ -591,7 +591,7 @@ nsWyciwygChannel::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsWyciwygChannel::OnStopRequest(nsIRequest *request, nsISupports *ctx,
nsWyciwygChannel::OnStopRequest(nsIRequest *request,
nsresult status) {
LOG(("nsWyciwygChannel::OnStopRequest [this=%p request=%p status=%" PRIu32
"]\n",
@@ -605,7 +605,7 @@ nsWyciwygChannel::OnStopRequest(nsIRequest *request, nsISupports *ctx,
listener.swap(mListener);
if (listener) {
listener->OnStopRequest(this, nullptr, mStatus);
listener->OnStopRequest(this, mStatus);
} else {
MOZ_ASSERT(false, "We must have a listener!");
}
@@ -716,7 +716,7 @@ void nsWyciwygChannel::NotifyListener() {
if (listener) {
listener->OnStartRequest(this);
mIsPending = false;
listener->OnStopRequest(this, nullptr, mStatus);
listener->OnStopRequest(this, mStatus);
} else {
MOZ_ASSERT(false, "We must have the listener!");
mIsPending = false;

2
netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
View File

@@ -1230,7 +1230,7 @@ mozTXTToHTMLConv::OnStartRequest(nsIRequest* request) {
}
NS_IMETHODIMP
mozTXTToHTMLConv::OnStopRequest(nsIRequest* request, nsISupports* ctxt,
mozTXTToHTMLConv::OnStopRequest(nsIRequest* request,
nsresult aStatus) {
return NS_ERROR_NOT_IMPLEMENTED;
}

4
netwerk/streamconv/converters/nsDirIndexParser.cpp
View File

@@ -92,11 +92,11 @@ nsDirIndexParser::OnStartRequest(nsIRequest *aRequest) {
}
NS_IMETHODIMP
nsDirIndexParser::OnStopRequest(nsIRequest *aRequest, nsISupports *aCtxt,
nsDirIndexParser::OnStopRequest(nsIRequest *aRequest,
nsresult aStatusCode) {
// Finish up
if (mBuf.Length() > (uint32_t)mLineStart) {
ProcessData(aRequest, aCtxt);
ProcessData(aRequest, nullptr);
}
return NS_OK;

4
netwerk/streamconv/converters/nsFTPDirListingConv.cpp
View File

@@ -168,11 +168,11 @@ nsFTPDirListingConv::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsFTPDirListingConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsFTPDirListingConv::OnStopRequest(nsIRequest *request,
nsresult aStatus) {
// we don't care about stop. move along...
return mFinalListener->OnStopRequest(request, ctxt, aStatus);
return mFinalListener->OnStopRequest(request, aStatus);
}
// nsFTPDirListingConv methods

4
netwerk/streamconv/converters/nsHTTPCompressConv.cpp
View File

@@ -127,7 +127,7 @@ nsHTTPCompressConv::OnStartRequest(nsIRequest *request) {
}
NS_IMETHODIMP
nsHTTPCompressConv::OnStopRequest(nsIRequest *request, nsISupports *aContext,
nsHTTPCompressConv::OnStopRequest(nsIRequest *request,
nsresult aStatus) {
nsresult status = aStatus;
LOG(("nsHttpCompresssConv %p onstop %" PRIx32 "\n", this,
@@ -167,7 +167,7 @@ nsHTTPCompressConv::OnStopRequest(nsIRequest *request, nsISupports *aContext,
MutexAutoLock lock(mMutex);
listener = mListener;
}
return listener->OnStopRequest(request, aContext, status);
return listener->OnStopRequest(request, status);
}
/* static */ nsresult nsHTTPCompressConv::BrotliHandler(

8
netwerk/streamconv/converters/nsIndexedToHTML.cpp
View File

@@ -641,19 +641,19 @@ nsresult nsIndexedToHTML::DoOnStartRequest(nsIRequest* request,
}
NS_IMETHODIMP
nsIndexedToHTML::OnStopRequest(nsIRequest* request, nsISupports* aContext,
nsIndexedToHTML::OnStopRequest(nsIRequest* request,
nsresult aStatus) {
if (NS_SUCCEEDED(aStatus)) {
nsCString buffer;
buffer.AssignLiteral("</tbody></table></body></html>\n");
aStatus = SendToListener(request, aContext, buffer);
aStatus = SendToListener(request, nullptr, buffer);
}
mParser->OnStopRequest(request, aContext, aStatus);
mParser->OnStopRequest(request, aStatus);
mParser = nullptr;
return mListener->OnStopRequest(request, aContext, aStatus);
return mListener->OnStopRequest(request, aStatus);
}
nsresult nsIndexedToHTML::SendToListener(nsIRequest* aRequest,

6
netwerk/streamconv/converters/nsMultiMixedConv.cpp
View File

@@ -63,7 +63,7 @@ nsresult nsPartChannel::SendOnStopRequest(nsISupports *aContext,
// Drop the listener
nsCOMPtr<nsIStreamListener> listener;
listener.swap(mListener);
return listener->OnStopRequest(this, aContext, aStatus);
return listener->OnStopRequest(this, aStatus);
}
void nsPartChannel::SetContentDisposition(
@@ -523,7 +523,7 @@ nsMultiMixedConv::OnDataAvailable(nsIRequest *request, nsISupports *context,
}
NS_IMETHODIMP
nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsMultiMixedConv::OnStopRequest(nsIRequest *request,
nsresult aStatus) {
nsresult rv;
@@ -553,7 +553,7 @@ nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
// above, would have been non-null.
(void)mFinalListener->OnStartRequest(request);
(void)mFinalListener->OnStopRequest(request, ctxt, aStatus);
(void)mFinalListener->OnStopRequest(request, aStatus);
}
return NS_OK;

9
netwerk/streamconv/converters/nsUnknownDecoder.cpp
View File

@@ -74,7 +74,6 @@ nsUnknownDecoder::ConvertedStreamListener::OnDataAvailable(
NS_IMETHODIMP
nsUnknownDecoder::ConvertedStreamListener::OnStopRequest(nsIRequest* request,
nsISupports* context,
nsresult status) {
return NS_OK;
}
@@ -269,7 +268,7 @@ nsUnknownDecoder::OnStartRequest(nsIRequest* request) {
}
NS_IMETHODIMP
nsUnknownDecoder::OnStopRequest(nsIRequest* request, nsISupports* aCtxt,
nsUnknownDecoder::OnStopRequest(nsIRequest* request,
nsresult aStatus) {
nsresult rv = NS_OK;
@@ -297,7 +296,7 @@ nsUnknownDecoder::OnStopRequest(nsIRequest* request, nsISupports* aCtxt,
forcePendingChannel->ForcePending(true);
}
rv = FireListenerNotifications(request, aCtxt);
rv = FireListenerNotifications(request, nullptr);
if (NS_FAILED(rv)) {
aStatus = rv;
@@ -315,7 +314,7 @@ nsUnknownDecoder::OnStopRequest(nsIRequest* request, nsISupports* aCtxt,
listener = mNextListener;
mNextListener = nullptr;
}
rv = listener->OnStopRequest(request, aCtxt, aStatus);
rv = listener->OnStopRequest(request, aStatus);
return rv;
}
@@ -803,7 +802,7 @@ nsresult nsUnknownDecoder::ConvertEncodedData(nsIRequest* request,
NS_ENSURE_SUCCESS(rv, rv);
}
listener->OnStopRequest(request, nullptr, NS_OK);
listener->OnStopRequest(request, NS_OK);
}
}
return rv;

4
parser/html/nsHtml5StreamListener.cpp
View File

@@ -43,11 +43,11 @@ nsHtml5StreamListener::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
nsHtml5StreamListener::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext, nsresult aStatus) {
nsresult aStatus) {
if (MOZ_UNLIKELY(!mDelegate)) {
return NS_ERROR_NOT_AVAILABLE;
}
return mDelegate->OnStopRequest(aRequest, aContext, aStatus);
return mDelegate->OnStopRequest(aRequest, aStatus);
}
NS_IMETHODIMP

3
parser/html/nsHtml5StreamParser.cpp
View File

@@ -1168,12 +1168,11 @@ class nsHtml5RequestStopper : public Runnable {
};
nsresult nsHtml5StreamParser::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult status) {
NS_ASSERTION(mRequest == aRequest, "Got Stop on wrong stream.");
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
if (mObserver) {
mObserver->OnStopRequest(aRequest, aContext, status);
mObserver->OnStopRequest(aRequest, status);
}
nsCOMPtr<nsIRunnable> stopper = new nsHtml5RequestStopper(this);
if (NS_FAILED(mEventTarget->Dispatch(stopper, nsIThread::DISPATCH_NORMAL))) {

2
parser/html/nsHtml5StreamParser.h
View File

@@ -132,7 +132,7 @@ class nsHtml5StreamParser final : public nsICharsetDetectionObserver {
nsIInputStream* aInStream, uint64_t aSourceOffset,
uint32_t aLength);
nsresult OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsresult OnStopRequest(nsIRequest* aRequest,
nsresult status);
// nsICharsetDetectionObserver

4
parser/htmlparser/nsParser.cpp
View File

@@ -1330,7 +1330,7 @@ nsresult nsParser::OnDataAvailable(nsIRequest* request, nsISupports* aContext,
* This is called by the networking library once the last block of data
* has been collected from the net.
*/
nsresult nsParser::OnStopRequest(nsIRequest* request, nsISupports* aContext,
nsresult nsParser::OnStopRequest(nsIRequest* request,
nsresult status) {
nsresult rv = NS_OK;
@@ -1362,7 +1362,7 @@ nsresult nsParser::OnStopRequest(nsIRequest* request, nsISupports* aContext,
// XXX Should we wait to notify our observers as well if the
// parser isn't yet enabled?
if (mObserver) {
mObserver->OnStopRequest(request, aContext, status);
mObserver->OnStopRequest(request, status);
}
return rv;

1
security/manager/ssl/ContentSignatureVerifier.cpp
View File

@@ -527,7 +527,6 @@ ContentSignatureVerifier::OnStartRequest(nsIRequest* aRequest) {
NS_IMETHODIMP
ContentSignatureVerifier::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatus) {
MOZ_ASSERT(NS_IsMainThread());
nsCOMPtr<nsIContentSignatureReceiverCallback> callback;

6
security/manager/ssl/PSMContentListener.cpp
View File

@@ -136,7 +136,6 @@ PSMContentStreamListener::OnDataAvailable(nsIRequest* request,
NS_IMETHODIMP
PSMContentStreamListener::OnStopRequest(nsIRequest* request,
nsISupports* context,
nsresult aStatus) {
MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("CertDownloader::OnStopRequest\n"));
@@ -233,8 +232,8 @@ mozilla::ipc::IPCResult PSMContentDownloaderParent::RecvOnStopRequest(
NS_IMETHODIMP
PSMContentDownloaderParent::OnStopRequest(nsIRequest* request,
nsISupports* context, nsresult code) {
nsresult rv = PSMContentStreamListener::OnStopRequest(request, context, code);
nsresult code) {
nsresult rv = PSMContentStreamListener::OnStopRequest(request, code);
if (mIPCOpen) {
mozilla::Unused << Send__delete__(this);
@@ -306,7 +305,6 @@ PSMContentDownloaderChild::OnDataAvailable(nsIRequest* request,
NS_IMETHODIMP
PSMContentDownloaderChild::OnStopRequest(nsIRequest* request,
nsISupports* context,
nsresult aStatus) {
mozilla::Unused << SendOnStopRequest(aStatus);
return NS_OK;

2
security/manager/ssl/PSMContentListener.h
View File

@@ -66,7 +66,7 @@ class PSMContentDownloaderParent : public PPSMContentDownloaderParent,
// We inherit most of nsIStreamListener from PSMContentStreamListener, but
// we have to override OnStopRequest to know when we're done with our IPC
// ref.
NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *aContext,
NS_IMETHOD OnStopRequest(nsIRequest *request,
nsresult code) override;
mozilla::ipc::IPCResult RecvDivertToParentUsing(

3
toolkit/components/extensions/webrequest/ChannelWrapper.cpp
View File

@@ -935,7 +935,6 @@ ChannelWrapper::RequestListener::OnStartRequest(nsIRequest* request) {
NS_IMETHODIMP
ChannelWrapper::RequestListener::OnStopRequest(nsIRequest* request,
nsISupports* aCtxt,
nsresult aStatus) {
MOZ_ASSERT(mOrigStreamListener, "Should have mOrigStreamListener");
@@ -943,7 +942,7 @@ ChannelWrapper::RequestListener::OnStopRequest(nsIRequest* request,
mChannelWrapper->ErrorCheck();
mChannelWrapper->FireEvent(NS_LITERAL_STRING("stop"));
return mOrigStreamListener->OnStopRequest(request, aCtxt, aStatus);
return mOrigStreamListener->OnStopRequest(request, aStatus);
}
NS_IMETHODIMP

4
toolkit/components/extensions/webrequest/StreamFilterParent.cpp
View File

@@ -502,7 +502,7 @@ StreamFilterParent::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
StreamFilterParent::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
StreamFilterParent::OnStopRequest(nsIRequest* aRequest,
nsresult aStatusCode) {
AssertIsMainThread();
@@ -525,7 +525,7 @@ nsresult StreamFilterParent::EmitStopRequest(nsresult aStatusCode) {
MOZ_ASSERT(!mSentStop);
mSentStop = true;
nsresult rv = mOrigListener->OnStopRequest(mChannel, mContext, aStatusCode);
nsresult rv = mOrigListener->OnStopRequest(mChannel, aStatusCode);
if (mLoadGroup && !mDisconnected) {
Unused << mLoadGroup->RemoveRequest(this, nullptr, aStatusCode);

1
toolkit/components/places/FaviconHelpers.cpp
View File

@@ -682,7 +682,6 @@ AsyncFetchAndSetIconForPage::AsyncOnChannelRedirect(
NS_IMETHODIMP
AsyncFetchAndSetIconForPage::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatusCode) {
MOZ_ASSERT(NS_IsMainThread());

2
toolkit/components/places/nsAnnoProtocolHandler.cpp
View File

@@ -158,7 +158,7 @@ class faviconAsyncLoader : public AsyncStatementCallback {
rv = GetDefaultIcon(mChannel, getter_AddRefs(newChannel));
if (NS_FAILED(rv)) {
mListener->OnStartRequest(mChannel);
mListener->OnStopRequest(mChannel, nullptr, rv);
mListener->OnStopRequest(mChannel, rv);
return rv;
}
return newChannel->AsyncOpen(mListener);

4
toolkit/components/reputationservice/ApplicationReputation.cpp
View File

@@ -1677,7 +1677,7 @@ PendingLookup::OnStartRequest(nsIRequest* aRequest) {
}
NS_IMETHODIMP
PendingLookup::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
PendingLookup::OnStopRequest(nsIRequest* aRequest,
nsresult aResult) {
NS_ENSURE_STATE(mCallback);
@@ -1698,7 +1698,7 @@ PendingLookup::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
uint32_t verdict = nsIApplicationReputationService::VERDICT_SAFE;
Reason reason = Reason::NotSet;
nsresult rv =
OnStopRequestInternal(aRequest, aContext, aResult, verdict, reason);
OnStopRequestInternal(aRequest, nullptr, aResult, verdict, reason);
OnComplete(verdict, reason, rv);
return rv;
}

Some files were not shown because too many files have changed in this diff Show More