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

Bug 1666745 - Fix nsDocShell::GetCurrentScrollRestorationIsManual with session history in the parent. r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D91113
This commit is contained in:
Peter Van der Beken
2020-09-23 12:12:51 +00:00
parent 3c7f719af3
commit 3708270d24
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docshell/base/nsDocShell.cpp
View File

@@ -11192,12 +11192,13 @@ nsresult nsDocShell::UpdateURLAndHistory(Document* aDocument, nsIURI* aNewURI,
NS_IMETHODIMP
nsDocShell::GetCurrentScrollRestorationIsManual(bool* aIsManual) {
if (StaticPrefs::fission_sessionHistoryInParent()) {
*aIsManual = mActiveEntry && mActiveEntry->GetScrollRestorationIsManual();
return NS_OK;
}
*aIsManual = false;
if (mOSHE) {
if (StaticPrefs::fission_sessionHistoryInParent()) {
*aIsManual = mActiveEntry->GetScrollRestorationIsManual();
return NS_OK;
}
return mOSHE->GetScrollRestorationIsManual(aIsManual);
}