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

moved to the higher level LoadURL() call to get more observer handling

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@42270 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com 1999-08-05 04:49:38 +00:00
parent ce69624078
commit 3adddf942c
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3051,7 +3051,6 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
if (NS_FAILED(rv)) return rv;
#endif
if (!mProcessedEndDocumentLoad) {
mProcessedEndDocumentLoad = PR_TRUE;
@ -3167,11 +3166,10 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
if (NS_FAILED(rv)) return rv;
nsString2 newURL(aSpec);
// reload the url
//const PRUnichar *spec = newURL.GetUnicode();
//if (spec) {
//rv = LoadURL(spec, "load");
rv = DoLoadURL(newURL,"view", nsnull, nsIChannel::LOAD_NORMAL, 0);
//}
const PRUnichar *spec = newURL.GetUnicode();
if (spec) {
rv = LoadURL(spec, "view");
}
} // retry
} // unknown host
#endif //NECKO

10
mozilla/webshell/src/nsWebShell.cpp
View File

@ -3051,7 +3051,6 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
if (NS_FAILED(rv)) return rv;
#endif
if (!mProcessedEndDocumentLoad) {
mProcessedEndDocumentLoad = PR_TRUE;
@ -3167,11 +3166,10 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
if (NS_FAILED(rv)) return rv;
nsString2 newURL(aSpec);
// reload the url
//const PRUnichar *spec = newURL.GetUnicode();
//if (spec) {
//rv = LoadURL(spec, "load");
rv = DoLoadURL(newURL,"view", nsnull, nsIChannel::LOAD_NORMAL, 0);
//}
const PRUnichar *spec = newURL.GetUnicode();
if (spec) {
rv = LoadURL(spec, "view");
}
} // retry
} // unknown host
#endif //NECKO