From ed9ad1b996c8c6fe2f80c5b03d86cdec3c7cb1a1 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Wed, 1 Nov 2000 08:03:58 +0000 Subject: [PATCH] Bug #56938 --> Break out the code which parses and sets up refresh urls into a separate method so we can expose it as an interface method via nsIRefreshURI. r=sspitzer,sr=rpotts git-svn-id: svn://10.0.0.236/trunk@82138 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index e90b8a72711..5da465f772f 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3772,6 +3772,17 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, PRUint32 aLoadType) } SetCurrentURI(aURI); + // if there's a refresh header in the channel, this method + // will set it up for us. + SetupRefreshURI(aChannel); + + mInitialPageLoad = PR_FALSE; + return NS_OK; +} + +NS_IMETHODIMP +nsDocShell::SetupRefreshURI(nsIChannel * aChannel) +{ nsCOMPtr httpChannel(do_QueryInterface(aChannel)); if(httpChannel) { @@ -3854,7 +3865,6 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, PRUint32 aLoadType) } } - mInitialPageLoad = PR_FALSE; return NS_OK; }