Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug # 160869. Tweak load Types of subframes according to the parent's loadtype. r=adamlock sr=rpotts

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@128771 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
radha%netscape.com
2002-09-03 23:37:19 +00:00
parent 1ebc6538fb
commit 190a88c582
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -594,10 +594,20 @@ nsDocShell::LoadURI(nsIURI * aURI,
shEntry = nsnull;
}
}
else {
// The child frame inherits the parent's loadType for
// LOAD_BYPASS_HISTORY, LOAD_REFRESH, all types of reloads
// and history loads.
else if (parentLoadType == LOAD_REFRESH) {
// Clear shEntry. For refresh loads, we have to load
// what comes thro' the pipe, not what's in history.
shEntry = nsnull;
}
else if ((parentLoadType == LOAD_BYPASS_HISTORY) ||
(shEntry &&
((parentLoadType & LOAD_CMD_HISTORY) ||
(parentLoadType == LOAD_RELOAD_NORMAL) ||
(parentLoadType == LOAD_RELOAD_CHARSET_CHANGE)))) {
// If the parent url, bypassed history or was loaded from
// history, pass on the parent's loadType to the new child
// frame too, so that the child frame will also
// avoid getting into history.
loadType = parentLoadType;
}
}
@@ -5589,7 +5599,8 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel,
// Determine if this type of load should update history.
if (aLoadType == LOAD_BYPASS_HISTORY ||
aLoadType & LOAD_CMD_HISTORY ||
aLoadType == LOAD_RELOAD_NORMAL)
aLoadType == LOAD_RELOAD_NORMAL ||
aLoadType == LOAD_RELOAD_CHARSET_CHANGE)
updateHistory = PR_FALSE;
// Check if the url to be loaded is the same as the one already loaded.