Bug 1645254 - Remove PHttpChannel::CancelRedirected, r=valentin,necko-reviewers
authorJunior Hsu <juhsu@mozilla.com>
Fri, 12 Jun 2020 14:13:57 +0000
changeset 535509 7d3bffbc7ad1a10db270809365ce3a17443c6566
parent 535508 6b65aedb21364a8eac153a6e81389ad391b430a3
child 535510 02234ba510ebb6b2ecd52b3cff7e49a3e586c22e
push id118895
push userjuhsu@mozilla.com
push dateFri, 12 Jun 2020 15:29:25 +0000
treeherderautoland@7d3bffbc7ad1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin, necko-reviewers
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1645254 - Remove PHttpChannel::CancelRedirected, r=valentin,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D79397
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -1967,21 +1967,16 @@ bool HttpChannelChild::Redirect3Complete
       httpChannelChild->mOverrideRunnable = nullptr;
       httpChannelChild->mInterceptingChannel = nullptr;
     return true;
   return false;
-mozilla::ipc::IPCResult HttpChannelChild::RecvCancelRedirected() {
-  CleanupRedirectingChannel(NS_BINDING_REDIRECTED);
-  return IPC_OK();
 void HttpChannelChild::CleanupRedirectingChannel(nsresult rv) {
   // Redirecting to new channel: shut this down and init new channel
   if (mLoadGroup) mLoadGroup->RemoveRequest(this, nullptr, NS_BINDING_ABORTED);
   if (NS_SUCCEEDED(rv)) {
     nsCString remoteAddress;
     Unused << GetRemoteAddress(remoteAddress);
     nsCOMPtr<nsIURI> referrer;
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -168,18 +168,16 @@ class HttpChannelChild final : public PH
   mozilla::ipc::IPCResult RecvSetPriority(const int16_t& aPriority) override;
   mozilla::ipc::IPCResult RecvAttachStreamFilter(
       Endpoint<extensions::PStreamFilterParent>&& aEndpoint) override;
   mozilla::ipc::IPCResult RecvCancelDiversion() override;
-  mozilla::ipc::IPCResult RecvCancelRedirected() override;
   mozilla::ipc::IPCResult RecvOriginalCacheInputStreamAvailable(
       const Maybe<IPCStream>& aStream) override;
   mozilla::ipc::IPCResult RecvAltDataCacheInputStreamAvailable(
       const Maybe<IPCStream>& aStream) override;
   mozilla::ipc::IPCResult RecvOverrideReferrerInfoDuringBeginConnect(
       nsIReferrerInfo* aReferrerInfo) override;
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -152,21 +152,16 @@ child:
   // Associate the child with an application ids
   async AssociateApplicationCache(nsCString groupID,
                                   nsCString clientID);
   // Report a security message to the console associated with this
   // channel.
   async ReportSecurityMessage(nsString messageTag, nsString messageCategory);
-  // This message is sent to a child that has been redirected to another process.
-  // As a consequence, it should cleanup the channel listeners and remove the
-  // request from the loadGroup.
-  async CancelRedirected();
   // Tell child to delete channel (all IPDL deletes must be done from child to
   // avoid races: see bug 591708).
   async DeleteSelf();
   // Tell the child to issue a deprecation warning.
   async IssueDeprecationWarning(uint32_t warning, bool asError);
   // When CORS blocks the request in the parent process, it doesn't have the