mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 22:05:44 +00:00
Bug 1375833 - Part 1: Do not clear subframe history on normal reload. r=smaug
In bug 1326251 we made gecko aggressively clear frame history. It turns out to be too aggressive comparing to all other major browsers. This patch reverses the behavior, so that only force reload and fresh would clear frame history, but not normal reload. MozReview-Commit-ID: EYVaA13cp6b --HG-- extra : rebase_source : 1edd23d0fc7ba3d8f319d2b8c3d9034befa8a818
This commit is contained in:
parent
3c6197157a
commit
d281a28f21
@ -11973,12 +11973,16 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel,
|
||||
} else if (mOSHE) {
|
||||
mOSHE->SetCacheKey(cacheKey);
|
||||
}
|
||||
|
||||
// Since we're force-reloading, clear all the sub frame history.
|
||||
ClearFrameHistory(mLSHE);
|
||||
ClearFrameHistory(mOSHE);
|
||||
}
|
||||
|
||||
// Clear subframe history on refresh or reload.
|
||||
// Clear subframe history on refresh.
|
||||
// XXX: history.go(0) won't go this path as aLoadType is LOAD_HISTORY in this
|
||||
// case. One should re-validate after bug 1331865 fixed.
|
||||
if (aLoadType == LOAD_REFRESH || (aLoadType & LOAD_CMD_RELOAD)) {
|
||||
if (aLoadType == LOAD_REFRESH) {
|
||||
ClearFrameHistory(mLSHE);
|
||||
ClearFrameHistory(mOSHE);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user