Backed out 3 changesets (bug 1653123, bug 1602115) for perma failures on test_history_length_during_pageload.html. CLOSED TREE

Backed out changeset 6b3c0f542ef3 (bug 1653123)
Backed out changeset 951c0fd65a00 (bug 1602115)
Backed out changeset 258d0ebd9e34 (bug 1602115)
This commit is contained in:
Razvan Maries
2020-07-16 23:21:18 +03:00
parent 5b2d248279
commit 22f0615ea7
20 changed files with 30 additions and 340 deletions

View File

@@ -5367,22 +5367,17 @@ nsresult nsDocShell::Embed(nsIContentViewer* aContentViewer,
SetDocCurrentStateObj(mLSHE);
SetHistoryEntryAndUpdateBC(Nothing(), Some<nsISHEntry*>(mLSHE));
nsID changeID = {};
if (StaticPrefs::fission_sessionHistoryInParent()) {
mActiveEntry = nullptr;
mLoadingEntry.swap(mActiveEntry);
if (mActiveEntry) {
if (XRE_IsParentProcess()) {
mBrowsingContext->Canonical()->SessionHistoryCommit(
mActiveEntry->Id(), changeID);
mActiveEntry->Id());
} else {
RefPtr<ChildSHistory> rootSH = GetRootSessionHistory();
if (rootSH) {
changeID = rootSH->AddPendingHistoryChange();
}
ContentChild* cc = ContentChild::GetSingleton();
mozilla::Unused << cc->SendHistoryCommit(
mBrowsingContext, mActiveEntry->Id(), changeID);
mozilla::Unused << cc->SendHistoryCommit(mBrowsingContext,
mActiveEntry->Id());
}
}
}