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

Bug 1698601 - Part 2: Carry over restore data to new context after a process swap, r=smaug

Browse Source 
Also, make sure we update layout history state from docshell before we load a
new URI, as it might be our last chance to do so before a process swap.

Differential Revision: https://phabricator.services.mozilla.com/D110994
This commit is contained in:
Anny Gakhokidze
2021-04-09 17:46:52 +00:00
parent 780445a687
commit 7e8269b1ab
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docshell/base/CanonicalBrowsingContext.cpp
View File

@@ -175,14 +175,13 @@ void CanonicalBrowsingContext::ReplacedBy(
}
aNewContext->mWebProgress = std::move(mWebProgress);
// Bug 1698601 - We'll eventually want to copy this data over to the new
// context instead of clearing it completely.
bool hasRestoreData = !!mRestoreData && !mRestoreData->IsEmpty();
aNewContext->mRestoreData = std::move(mRestoreData);
aNewContext->mRequestedContentRestores = mRequestedContentRestores;
aNewContext->mCompletedContentRestores = mCompletedContentRestores;
SetRestoreData(nullptr);
mRequestedContentRestores = 0;
mCompletedContentRestores = 0;
aNewContext->mRestoreData = nullptr;
aNewContext->mRequestedContentRestores = 0;
aNewContext->mCompletedContentRestores = 0;
// Use the Transaction for the fields which need to be updated whether or not
// the new context has been attached before.
@@ -191,7 +190,7 @@ void CanonicalBrowsingContext::ReplacedBy(
txn.SetBrowserId(GetBrowserId());
txn.SetHistoryID(GetHistoryID());
txn.SetExplicitActive(GetExplicitActive());
txn.SetHasRestoreData(false);
txn.SetHasRestoreData(hasRestoreData);
if (aNewContext->EverAttached()) {
MOZ_ALWAYS_SUCCEEDS(txn.Commit(aNewContext));
} else {