Bug 1598520 - Don't require nsIChildChannel for process switching, as we don't need this for DocumentChannel either. r=mayhemer,kmag

Differential Revision: https://phabricator.services.mozilla.com/D57586
This commit is contained in:
Matt Woodrow
2020-01-06 21:58:48 +00:00
parent 9ede95a31f
commit 8b1b33cac0
7 changed files with 60 additions and 77 deletions

View File

@@ -19,7 +19,7 @@ class nsIInputStream;
class nsISHEntry;
class nsIURI;
class nsIDocShell;
class nsIChildChannel;
class nsIChannel;
class nsIReferrerInfo;
class OriginAttibutes;
namespace mozilla {
@@ -40,7 +40,7 @@ class nsDocShellLoadState final {
explicit nsDocShellLoadState(
const mozilla::dom::DocShellLoadStateInit& aLoadState);
static nsresult CreateFromPendingChannel(nsIChildChannel* aPendingChannel,
static nsresult CreateFromPendingChannel(nsIChannel* aPendingChannel,
nsDocShellLoadState** aResult);
static nsresult CreateFromLoadURIOptions(
@@ -200,7 +200,7 @@ class nsDocShellLoadState final {
return mIsFromProcessingFrameAttributes;
}
nsIChildChannel* GetPendingRedirectedChannel() {
nsIChannel* GetPendingRedirectedChannel() {
return mPendingRedirectedChannel;
}
@@ -365,7 +365,7 @@ class nsDocShellLoadState final {
// If set, a pending cross-process redirected channel should be used to
// perform the load. The channel will be stored in this value.
nsCOMPtr<nsIChildChannel> mPendingRedirectedChannel;
nsCOMPtr<nsIChannel> mPendingRedirectedChannel;
// An optional string representation of mURI, before any
// fixups were applied, so that we can send it to a search