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

check in for rpotts bug#82244

Browse Source 
when we do meta charset reload, load it from cache by using the same load flag history using.
author=rpotts r=radha/adamlock sr=vidur a=chofmann


git-svn-id: svn://10.0.0.236/trunk@97706 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ftang%netscape.com
2001-06-22 00:54:27 +00:00
parent f78f6b1ac0
commit 63acb43ea5
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2167,14 +2167,19 @@ nsDocShell::LoadURI(const PRUnichar * aURI, PRUint32 aLoadFlags)
NS_IMETHODIMP
nsDocShell::Reload(PRUint32 aReloadFlags)
{
NS_ASSERTION(((aReloadFlags & 0xf) == 0),
"Reload command not updated to use load flags!");
// XXXTAB Convert reload type to our type
LoadType type = LOAD_RELOAD_NORMAL;
LoadType type;
if (aReloadFlags & LOAD_FLAGS_BYPASS_CACHE &&
aReloadFlags & LOAD_FLAGS_BYPASS_PROXY)
aReloadFlags & LOAD_FLAGS_BYPASS_PROXY) {
type = LOAD_RELOAD_BYPASS_PROXY_AND_CACHE;
}
else if (aReloadFlags & LOAD_HISTORY) {
// XXX: LOAD_HISTORY really means load from cache...
type = LOAD_HISTORY;
}
else {
type = LOAD_RELOAD_NORMAL;
}
nsresult rv;
/* If you change this part of code, make sure bug 45297 does not re-occur */

3
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -629,7 +629,8 @@ nsWebShell::ReloadDocument(const char* aCharset,
muDV->SetHintCharacterSet(NS_ConvertASCIItoUCS2(aCharset).GetUnicode());
muDV->SetHintCharacterSetSource((PRInt32)aSource);
mCharsetReloadState = eCharsetReloadRequested;
return Reload(LOAD_FLAGS_NONE);
// XXX: LOAD_HISTORY really means load from cache...
return Reload(LOAD_HISTORY);
}
}
}