Backed out 5 changesets (bug 1650089) for Browser-chrome failures in browser/components/originattributes/test/browser/browser_firstPartyIsolation_aboutPages.js. CLOSED TREE
Backed out changeset 26ddad079ad3 (bug 1650089) Backed out changeset 5ae2b2641484 (bug 1650089) Backed out changeset c5d267a1907c (bug 1650089) Backed out changeset d9eeca699dec (bug 1650089) Backed out changeset 8bb303f6831a (bug 1650089)
This commit is contained in:
@@ -88,7 +88,6 @@ nsDocShellLoadState::nsDocShellLoadState(
|
||||
aLoadState.loadingSessionHistoryInfo().ref());
|
||||
}
|
||||
mUnstrippedURI = aLoadState.UnstrippedURI();
|
||||
mRemoteTypeOverride = aLoadState.RemoteTypeOverride();
|
||||
}
|
||||
|
||||
nsDocShellLoadState::nsDocShellLoadState(const nsDocShellLoadState& aOther)
|
||||
@@ -134,8 +133,7 @@ nsDocShellLoadState::nsDocShellLoadState(const nsDocShellLoadState& aOther)
|
||||
mLoadIdentifier(aOther.mLoadIdentifier),
|
||||
mChannelInitialized(aOther.mChannelInitialized),
|
||||
mIsMetaRefresh(aOther.mIsMetaRefresh),
|
||||
mUnstrippedURI(aOther.mUnstrippedURI),
|
||||
mRemoteTypeOverride(aOther.mRemoteTypeOverride) {
|
||||
mUnstrippedURI(aOther.mUnstrippedURI) {
|
||||
if (aOther.mLoadingSessionHistoryInfo) {
|
||||
mLoadingSessionHistoryInfo = MakeUnique<LoadingSessionHistoryInfo>(
|
||||
*aOther.mLoadingSessionHistoryInfo);
|
||||
@@ -371,11 +369,6 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
|
||||
nsDocShell::MaybeNotifyKeywordSearchLoading(searchProvider, keyword);
|
||||
}
|
||||
|
||||
if (aLoadURIOptions.mRemoteTypeOverride.WasPassed()) {
|
||||
loadState->SetRemoteTypeOverride(
|
||||
aLoadURIOptions.mRemoteTypeOverride.Value());
|
||||
}
|
||||
|
||||
loadState.forget(aResult);
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -1053,7 +1046,6 @@ DocShellLoadStateInit nsDocShellLoadState::Serialize() {
|
||||
loadState.loadingSessionHistoryInfo().emplace(*mLoadingSessionHistoryInfo);
|
||||
}
|
||||
loadState.UnstrippedURI() = mUnstrippedURI;
|
||||
loadState.RemoteTypeOverride() = mRemoteTypeOverride;
|
||||
return loadState;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user