From 3adddf942c4fd56d4bfd034716b439e564dcf4c1 Mon Sep 17 00:00:00 2001 From: "valeski%netscape.com" Date: Thu, 5 Aug 1999 04:49:38 +0000 Subject: [PATCH] moved to the higher level LoadURL() call to get more observer handling git-svn-id: svn://10.0.0.236/trunk@42270 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 10 ++++------ mozilla/webshell/src/nsWebShell.cpp | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 3b9f40f845c..239d0807c2d 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -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 diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 3b9f40f845c..239d0807c2d 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -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