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

Backed out 2 changesets (bug 1673947, bug 1671962) for wpt failure on nested-context-navigations-iframe.html . CLOSED TREE

Browse Source 
Backed out changeset 8c71945d53bd (bug 1673947)
Backed out changeset 84ed543cd810 (bug 1671962)
This commit is contained in:
Narcis Beleuzu
2020-10-30 21:05:41 +02:00
parent dfe8151a2b
commit cc40242343
8 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docshell/base/nsDocShell.cpp
View File

@@ -8950,7 +8950,8 @@ nsresult nsDocShell::HandleSameDocumentNavigation(
// FIXME We should probably just compute mChildOffset in the parent
// instead of passing it over IPC here.
mBrowsingContext->SetActiveSessionHistoryEntry(
Some(scrollPos), mActiveEntry.get(), mLoadType, cacheKey);
Some(scrollPos), mActiveEntry.get(), mLoadType, mChildOffset,
cacheKey);
// FIXME Do we need to update mPreviousEntryIndex and mLoadedEntryIndex?
}
}
@@ -11622,7 +11623,7 @@ void nsDocShell::UpdateActiveEntry(
// FIXME We should probably just compute mChildOffset in the parent
// instead of passing it over IPC here.
mBrowsingContext->SetActiveSessionHistoryEntry(
aPreviousScrollPos, mActiveEntry.get(), mLoadType,
aPreviousScrollPos, mActiveEntry.get(), mLoadType, mChildOffset,
/* aCacheKey = */ 0);
// FIXME Do we need to update mPreviousEntryIndex and mLoadedEntryIndex?
}