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

Backed out changeset 24d6087acc64 (bug 1658821) for build bustage at SessionHistoryEntry.cpp. CLOSED TREE

Browse Source
This commit is contained in:
Butkovits Atila
2020-08-20 17:37:53 +03:00
parent 96df4d033d
commit 720f9513be
9 changed files with 65 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docshell/base/nsDocShell.cpp
View File

@@ -5427,8 +5427,8 @@ nsresult nsDocShell::Embed(nsIContentViewer* aContentViewer,
MOZ_ASSERT(loadingEntry);
nsID changeID = {};
if (XRE_IsParentProcess()) {
mBrowsingContext->Canonical()->SessionHistoryCommit(
loadingEntry->mLoadId, changeID);
mBrowsingContext->Canonical()->SessionHistoryCommit(mActiveEntry->Id(),
changeID);
} else {
RefPtr<ChildSHistory> rootSH = GetRootSessionHistory();
if (rootSH) {
@@ -5443,8 +5443,8 @@ nsresult nsDocShell::Embed(nsIContentViewer* aContentViewer,
}
}
ContentChild* cc = ContentChild::GetSingleton();
mozilla::Unused << cc->SendHistoryCommit(
mBrowsingContext, loadingEntry->mLoadId, changeID);
mozilla::Unused << cc->SendHistoryCommit(mBrowsingContext,
mActiveEntry->Id(), changeID);
}
}
}