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

Bug 1679418 - Fix test_bug1300461.html failure for Fission. r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D99711
This commit is contained in:
Peter Van der Beken
2021-01-25 12:59:26 +00:00
parent 8dbcdcafd4
commit df4a302874
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
docshell/base/CanonicalBrowsingContext.cpp
View File

@@ -427,18 +427,21 @@ CanonicalBrowsingContext::ReplaceLoadingSessionHistoryEntryForLoad(
}
newEntry->SetDocshellID(GetHistoryID());
newEntry->SetIsDynamicallyAdded(CreatedDynamically());
newEntry->SetForInitialLoad(true);
// Replacing the old entry.
SessionHistoryEntry::SetByLoadId(aInfo->mLoadId, newEntry);
bool forInitialLoad = true;
for (size_t i = 0; i < mLoadingEntries.Length(); ++i) {
if (mLoadingEntries[i].mLoadId == aInfo->mLoadId) {
forInitialLoad = mLoadingEntries[i].mEntry->ForInitialLoad();
mLoadingEntries[i].mEntry = newEntry;
break;
}
}
newEntry->SetForInitialLoad(forInitialLoad);
return MakeUnique<LoadingSessionHistoryInfo>(newEntry, aInfo->mLoadId);
}
@@ -510,26 +513,25 @@ void CanonicalBrowsingContext::SessionHistoryCommit(uint64_t aLoadId,
bool addEntry = ShouldUpdateSessionHistory(aLoadType);
if (IsTop()) {
mActiveEntry = newActiveEntry;
if (LOAD_TYPE_HAS_FLAGS(aLoadType,
nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY)) {
// Replace the current entry with the new entry.
int32_t index = shistory->GetIndexForReplace();
// If we're trying to replace an inexistant shistory entry then we
// should append instead.
addEntry = index < 0;
if (!addEntry) {
shistory->ReplaceEntry(index, mActiveEntry);
}
}
if (loadFromSessionHistory) {
// XXX Synchronize browsing context tree and session history tree?
shistory->UpdateIndex();
} else {
if (LOAD_TYPE_HAS_FLAGS(
aLoadType, nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY)) {
// Replace the current entry with the new entry.
int32_t index = shistory->GetIndexForReplace();
// If we're trying to replace an inexistant shistory entry then we
// should append instead.
addEntry = index < 0;
if (!addEntry) {
shistory->ReplaceEntry(index, mActiveEntry);
}
}
if (addEntry) {
shistory->AddEntry(mActiveEntry, aPersist);
}
} else if (addEntry) {
shistory->AddEntry(mActiveEntry, aPersist);
}
} else {
// FIXME The old implementations adds it to the parent's mLSHE if there