Skip to content

Commit c485331

Browse files
author
Jonathan Kingston
committed
Bug 1525319 - Removing context from OnStopRequest r=valentin
Differential Revision: https://phabricator.services.mozilla.com/D20770 --HG-- extra : moz-landing-system : lando
1 parent f7e35ae commit c485331

File tree

111 files changed

+179
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+179
-218
lines changed

‎docshell/base/nsPingListener.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ nsPingListener::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
341341
}
342342

343343
NS_IMETHODIMP
344-
nsPingListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
344+
nsPingListener::OnStopRequest(nsIRequest* aRequest,
345345
nsresult aStatus) {
346346
mLoadGroup = nullptr;
347347

‎dom/base/DOMParser.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ already_AddRefed<Document> DOMParser::ParseFromStream(nsIInputStream* aStream,
209209
parserChannel->GetStatus(&status);
210210
}
211211

212-
rv = listener->OnStopRequest(parserChannel, nullptr, status);
212+
rv = listener->OnStopRequest(parserChannel, status);
213213
// Failure returned from OnStopRequest does not affect the final status of
214214
// the channel, so we do not need to call Cancel(rv) as we do above.
215215

‎dom/base/Document.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -996,13 +996,12 @@ ExternalResourceMap::PendingLoad::OnDataAvailable(nsIRequest* aRequest,
996996

997997
NS_IMETHODIMP
998998
ExternalResourceMap::PendingLoad::OnStopRequest(nsIRequest* aRequest,
999-
nsISupports* aContext,
1000999
nsresult aStatus) {
10011000
// mTargetListener might be null if SetupViewer or AddExternalResource failed
10021001
if (mTargetListener) {
10031002
nsCOMPtr<nsIStreamListener> listener;
10041003
mTargetListener.swap(listener);
1005-
return listener->OnStopRequest(aRequest, aContext, aStatus);
1004+
return listener->OnStopRequest(aRequest, aStatus);
10061005
}
10071006

10081007
return NS_OK;

‎dom/base/EventSource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ EventSourceImpl::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
725725
}
726726

727727
NS_IMETHODIMP
728-
EventSourceImpl::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
728+
EventSourceImpl::OnStopRequest(nsIRequest* aRequest,
729729
nsresult aStatusCode) {
730730
AssertIsOnMainThread();
731731

‎dom/base/Navigator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ BeaconStreamListener::OnStartRequest(nsIRequest* aRequest) {
10491049
}
10501050

10511051
NS_IMETHODIMP
1052-
BeaconStreamListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
1052+
BeaconStreamListener::OnStopRequest(nsIRequest* aRequest,
10531053
nsresult aStatus) {
10541054
return NS_OK;
10551055
}

‎dom/base/nsObjectLoadingContent.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,6 @@ nsObjectLoadingContent::OnStartRequest(nsIRequest* aRequest) {
10121012

10131013
NS_IMETHODIMP
10141014
nsObjectLoadingContent::OnStopRequest(nsIRequest* aRequest,
1015-
nsISupports* aContext,
10161015
nsresult aStatusCode) {
10171016
AUTO_PROFILER_LABEL("nsObjectLoadingContent::OnStopRequest", NETWORK);
10181017

@@ -1038,7 +1037,7 @@ nsObjectLoadingContent::OnStopRequest(nsIRequest* aRequest,
10381037
// This may re-enter in the case of plugin listeners
10391038
nsCOMPtr<nsIStreamListener> listenerGrip(mFinalListener);
10401039
mFinalListener = nullptr;
1041-
listenerGrip->OnStopRequest(aRequest, aContext, aStatusCode);
1040+
listenerGrip->OnStopRequest(aRequest, aStatusCode);
10421041
}
10431042

10441043
// Return value doesn't matter
@@ -2261,7 +2260,7 @@ nsresult nsObjectLoadingContent::CloseChannel() {
22612260
if (listenerGrip) {
22622261
// mFinalListener is only set by LoadObject after OnStartRequest, or
22632262
// by OnStartRequest in the case of late-opened plugin streams
2264-
listenerGrip->OnStopRequest(channelGrip, nullptr, NS_BINDING_ABORTED);
2263+
listenerGrip->OnStopRequest(channelGrip, NS_BINDING_ABORTED);
22652264
}
22662265
}
22672266
return NS_OK;

‎dom/base/nsSyncLoadService.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ nsForceXMLListener::OnStartRequest(nsIRequest *aRequest) {
101101
}
102102

103103
NS_IMETHODIMP
104-
nsForceXMLListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
104+
nsForceXMLListener::OnStopRequest(nsIRequest *aRequest,
105105
nsresult aStatusCode) {
106-
return mListener->OnStopRequest(aRequest, aContext, aStatusCode);
106+
return mListener->OnStopRequest(aRequest, aStatusCode);
107107
}
108108

109109
nsSyncLoader::~nsSyncLoader() {
@@ -244,12 +244,12 @@ nsSyncLoader::OnStartRequest(nsIRequest *aRequest) {
244244
}
245245

246246
NS_IMETHODIMP
247-
nsSyncLoader::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
247+
nsSyncLoader::OnStopRequest(nsIRequest *aRequest,
248248
nsresult aStatusCode) {
249249
if (NS_SUCCEEDED(mAsyncLoadStatus) && NS_FAILED(aStatusCode)) {
250250
mAsyncLoadStatus = aStatusCode;
251251
}
252-
nsresult rv = mListener->OnStopRequest(aRequest, aContext, aStatusCode);
252+
nsresult rv = mListener->OnStopRequest(aRequest, aStatusCode);
253253
if (NS_SUCCEEDED(mAsyncLoadStatus) && NS_FAILED(rv)) {
254254
mAsyncLoadStatus = rv;
255255
}
@@ -357,7 +357,7 @@ nsresult nsSyncLoadService::PushSyncStreamToListener(
357357
if (NS_FAILED(rv)) {
358358
aChannel->Cancel(rv);
359359
}
360-
aListener->OnStopRequest(aChannel, nullptr, rv);
360+
aListener->OnStopRequest(aChannel, rv);
361361

362362
return rv;
363363
}

‎dom/fetch/FetchDriver.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ AlternativeDataStreamListener::OnDataAvailable(nsIRequest* aRequest,
273273

274274
NS_IMETHODIMP
275275
AlternativeDataStreamListener::OnStopRequest(nsIRequest* aRequest,
276-
nsISupports* aContext,
277276
nsresult aStatusCode) {
278277
AssertIsOnMainThread();
279278

@@ -288,7 +287,7 @@ AlternativeDataStreamListener::OnStopRequest(nsIRequest* aRequest,
288287

289288
if (mStatus == AlternativeDataStreamListener::FALLBACK) {
290289
MOZ_ASSERT(fetchDriver);
291-
return fetchDriver->OnStopRequest(aRequest, aContext, aStatusCode);
290+
return fetchDriver->OnStopRequest(aRequest, aStatusCode);
292291
}
293292

294293
MOZ_DIAGNOSTIC_ASSERT(mStatus == AlternativeDataStreamListener::LOADING);
@@ -1188,7 +1187,7 @@ FetchDriver::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
11881187
}
11891188

11901189
NS_IMETHODIMP
1191-
FetchDriver::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
1190+
FetchDriver::OnStopRequest(nsIRequest* aRequest,
11921191
nsresult aStatusCode) {
11931192
AssertIsOnMainThread();
11941193

‎dom/file/MutableBlobStreamListener.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ MutableBlobStreamListener::OnStartRequest(nsIRequest* aRequest) {
5050

5151
NS_IMETHODIMP
5252
MutableBlobStreamListener::OnStopRequest(nsIRequest* aRequest,
53-
nsISupports* aContext,
5453
nsresult aStatus) {
5554
MOZ_ASSERT(NS_IsMainThread());
5655
MOZ_ASSERT(mStorage);

‎dom/html/HTMLMediaElement.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,10 +699,9 @@ HTMLMediaElement::MediaLoadListener::OnStartRequest(nsIRequest* aRequest) {
699699

700700
NS_IMETHODIMP
701701
HTMLMediaElement::MediaLoadListener::OnStopRequest(nsIRequest* aRequest,
702-
nsISupports* aContext,
703702
nsresult aStatus) {
704703
if (mNextListener) {
705-
return mNextListener->OnStopRequest(aRequest, aContext, aStatus);
704+
return mNextListener->OnStopRequest(aRequest, aStatus);
706705
}
707706
return NS_OK;
708707
}

0 commit comments

Comments
 (0)