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

M9 BRANCH landing...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@44701 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
1999-08-26 22:45:55 +00:00
parent 1d9c25f2d3
commit c1eed107d9
75 changed files with 1224 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2052,7 +2052,7 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec,
// Pass notifications to BrowserAppCore just to be consistent with
// regular page loads thro' necko
nsCOMPtr<nsIChannel> dummyChannel;
rv = NS_OpenURI(getter_AddRefs(dummyChannel), url);
rv = NS_OpenURI(getter_AddRefs(dummyChannel), url, nsnull);
if (NS_FAILED(rv)) return rv;
mProcessedEndDocumentLoad = PR_FALSE;
@@ -2080,7 +2080,7 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec,
// Pass notifications to BrowserAppCore just to be consistent with
// regular necko loads.
nsCOMPtr<nsIChannel> dummyChannel;
rv = NS_OpenURI(getter_AddRefs(dummyChannel), url);
rv = NS_OpenURI(getter_AddRefs(dummyChannel), url, nsnull);
if (NS_FAILED(rv)) return rv;
mProcessedEndDocumentLoad = PR_FALSE;
@@ -3228,7 +3228,8 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
if (NS_FAILED(rv)) return rv;
#endif
if (!mProcessedEndDocumentLoad) {
//if (!mProcessedEndDocumentLoad) {
if (loader == mDocLoader) {
mProcessedEndDocumentLoad = PR_TRUE;
if (nsnull != mScriptGlobal) {