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

webshell/public/nsIDocumentLoader.h

Browse Source 
Extended the nsIDocumentLoader interface's LoadURL() method to take a reload type parameter.

webshell/public/nsIWebShell.h
Extended the nsIWebShell interface's LoadURL() method to take a reload type parameter.

webshell/src/nsDocLoader.cpp
1. Extended the nsIDocumentBindInfo interface's Bind() method to take a reload type parameter. The Bind() method now takes the reload parameter and passes it to the nsIUrl it creates.
2. Added support to the DocumentLoader for the extended LoadURL() parameter list. It now passes the reload type down into the Bind() method of the nsIDocumentBindInfo.

webshell/src/nsWebShell.cpp
1. Added support to the nsWebShell to use the new reload type parameter during loads.
2. Hooked up the reload type parameter in the nsWebShell::Reload() method so we actually use it.


git-svn-id: svn://10.0.0.236/trunk@8211 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com
1998-08-19 23:01:52 +00:00
parent b4d5c7e4ce
commit 277cec0087
6 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,8 @@ public:
NS_IMETHOD GetDocumentLoader(nsIDocumentLoader*& aResult);
NS_IMETHOD LoadURL(const PRUnichar *aURLSpec,
nsIPostData* aPostData=nsnull,
PRBool aModifyHistory=PR_TRUE);
PRBool aModifyHistory=PR_TRUE,
nsReloadType type = nsReload);
NS_IMETHOD Stop(void);
NS_IMETHOD Reload(nsReloadType aType);
@@ -952,7 +953,8 @@ static void convertFileToURL(nsString &aIn, nsString &aOut)
NS_IMETHODIMP
nsWebShell::LoadURL(const PRUnichar *aURLSpec,
nsIPostData* aPostData,
PRBool aModifyHistory)
PRBool aModifyHistory,
nsReloadType type)
{
nsresult rv;
PRInt32 colon, fSlash;
@@ -1024,7 +1026,8 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
this, // Container
aPostData, // Post Data
nsnull, // Extra Info...
mObserver); // Observer
mObserver, // Observer
(PRInt32)type); // reload type
return rv;
@@ -1048,7 +1051,7 @@ NS_IMETHODIMP nsWebShell::Reload(nsReloadType aType)
nsString* s = (nsString*) mHistory.ElementAt(mHistoryIndex);
if (nsnull != s) {
// XXX What about the post data?
return LoadURL(*s, nsnull, PR_FALSE);
return LoadURL(*s, nsnull, PR_FALSE, aType);
}
return NS_ERROR_FAILURE;
}
@@ -1121,7 +1124,8 @@ nsWebShell::GoTo(PRInt32 aHistoryIndex)
this, // Container
nsnull, // Post Data
nsnull, // Extra Info...
mObserver); // Observer
mObserver, // Observer
nsReload); // the reload type
}
return rv;
}
@@ -1613,7 +1617,7 @@ nsWebShell::CancelRefreshURLTimers(void) {
void nsWebShell::RefreshURLCallback(nsITimer* aTimer, void* aClosure) {
refreshData *data=(refreshData*)aClosure;
NS_PRECONDITION((data != nsnull), "Null pointer...");
data->shell->LoadURL(*data->aUrlSpec, nsnull, PR_TRUE);
data->shell->LoadURL(*data->aUrlSpec, nsnull, PR_TRUE, nsReload);
}
//----------------------------------------------------------------------