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

Fix for bug # 55145. r=pollmann a=rpotts

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@81140 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
radha%netscape.com
2000-10-13 20:49:40 +00:00
parent 92f88bed7e
commit 4e0df00662
5 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -413,7 +413,12 @@ nsDocShell::LoadURI(nsIURI* aURI, nsIDocShellLoadInfo* aLoadInfo, PRUint32 aLoad
if (parent) {
parent->GetChildSHEntry(mChildOffset, getter_AddRefs(shEntry));
if (shEntry) {
loadType = LOAD_HISTORY;
//Get the proper loadType from the SHEntry.
PRUint32 lt;
shEntry->GetLoadType(&lt);
// Convert the DocShellInfoLoadType returned by the
// previous function to loadType
loadType = ConvertDocShellLoadInfoToLoadType((nsDocShellInfoLoadType)lt);
}
}
}
@@ -1213,10 +1218,18 @@ nsDocShell::GetChildSHEntry(PRInt32 aChildOffset, nsISHEntry ** aResult)
// the progress of loading a document too...
//
if (LSHE) {
nsCOMPtr<nsISHContainer> container(do_QueryInterface(LSHE));
if (container) {
rv = container->GetChildAt(aChildOffset, aResult);
}
/* Get the parent's Load Type so that it can be set on the child too.
* By default give a loadHistory value
*/
PRUint32 loadType = nsIDocShellLoadInfo::loadHistory;
LSHE->GetLoadType(&loadType);
nsCOMPtr<nsISHContainer> container(do_QueryInterface(LSHE));
if (container) {
rv = container->GetChildAt(aChildOffset, aResult);
if (*aResult) {
(*aResult)->SetLoadType(loadType);
}
}
}
return rv;
}
@@ -2539,6 +2552,8 @@ nsDocShell::OnStateChange(nsIWebProgress *aProgress, nsIRequest *aRequest,
{
if ((aStateFlags & STATE_STOP) && (aStateFlags & STATE_IS_NETWORK)) {
if (LSHE)
LSHE->SetLoadType(nsIDocShellLoadInfo::loadHistory);
LSHE = nsnull;
}
return NS_OK;