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

Backed out 2 changesets (bug 1656997, bug 1656996) for fission failures on browser_preferences_usage.js. CLOSED TREE

Browse Source 
Backed out changeset c3aaa4f191e6 (bug 1656997)
Backed out changeset e41977f9608f (bug 1656996)
This commit is contained in:
Csoregi Natalia
2020-08-14 00:47:56 +03:00
parent 7eccb93d2d
commit 568e94a5b4
17 changed files with 130 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
docshell/base/nsDocShellLoadState.cpp
View File

@@ -76,9 +76,9 @@ nsDocShellLoadState::nsDocShellLoadState(
mHeadersStream = aLoadState.HeadersStream();
mSrcdocData = aLoadState.SrcdocData();
mChannelInitialized = aLoadState.ChannelInitialized();
if (aLoadState.loadingSessionHistoryInfo().isSome()) {
mLoadingSessionHistoryInfo = MakeUnique<LoadingSessionHistoryInfo>(
aLoadState.loadingSessionHistoryInfo().value());
if (aLoadState.sessionHistoryInfo().isSome()) {
mSessionHistoryInfo =
MakeUnique<SessionHistoryInfo>(aLoadState.sessionHistoryInfo().value());
}
}
@@ -510,30 +510,20 @@ void nsDocShellLoadState::SetSHEntry(nsISHEntry* aSHEntry) {
mSHEntry = aSHEntry;
nsCOMPtr<SessionHistoryEntry> she = do_QueryInterface(aSHEntry);
if (she) {
SetLoadingSessionHistoryInfo(LoadingSessionHistoryInfo(she->Info()));
SetSessionHistoryInfo(she->Info());
} else {
mLoadingSessionHistoryInfo = nullptr;
mSessionHistoryInfo = nullptr;
}
}
void nsDocShellLoadState::SetLoadingSessionHistoryInfo(
const mozilla::dom::LoadingSessionHistoryInfo& aLoadingInfo) {
mLoadingSessionHistoryInfo =
MakeUnique<LoadingSessionHistoryInfo>(aLoadingInfo);
void nsDocShellLoadState::SetSessionHistoryInfo(
const mozilla::dom::SessionHistoryInfo& aInfo) {
mSessionHistoryInfo = MakeUnique<SessionHistoryInfo>(aInfo);
}
const mozilla::dom::LoadingSessionHistoryInfo*
nsDocShellLoadState::GetLoadingSessionHistoryInfo() const {
return mLoadingSessionHistoryInfo.get();
}
void nsDocShellLoadState::SetLoadIsFromSessionHistory(
int32_t aRequestedIndex, int32_t aSessionHistoryLength) {
if (mLoadingSessionHistoryInfo) {
mLoadingSessionHistoryInfo->mIsLoadFromSessionHistory = true;
mLoadingSessionHistoryInfo->mRequestedIndex = aRequestedIndex;
mLoadingSessionHistoryInfo->mSessionHistoryLength = aSessionHistoryLength;
}
const mozilla::dom::SessionHistoryInfo*
nsDocShellLoadState::GetSessionHistoryInfo() const {
return mSessionHistoryInfo.get();
}
const nsString& nsDocShellLoadState::Target() const { return mTarget; }
@@ -925,8 +915,8 @@ DocShellLoadStateInit nsDocShellLoadState::Serialize() {
loadState.ResultPrincipalURI() = mResultPrincipalURI;
loadState.LoadIdentifier() = mLoadIdentifier;
loadState.ChannelInitialized() = mChannelInitialized;
if (mLoadingSessionHistoryInfo) {
loadState.loadingSessionHistoryInfo().emplace(*mLoadingSessionHistoryInfo);
if (mSessionHistoryInfo) {
loadState.sessionHistoryInfo().emplace(*mSessionHistoryInfo);
}
return loadState;
}