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

Bug 181910. Click on 2 links in quick succession, onload has problems with final loaded page. r=rpotts, sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@135279 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
aaronl%netscape.com
2002-12-14 00:46:37 +00:00
parent 29d19c09a2
commit c5e7e952a6
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5081,12 +5081,27 @@ nsDocShell::InternalLoad(nsIURI * aURI,
}
}
//
// Stop any current network activity. Do not stop the content until
// data starts arriving from the new URI...
//
rv = Stop(nsIWebNavigation::STOP_NETWORK);
if (NS_FAILED(rv)) return rv;
// Stop any current network activity.
// Also stop content if this is a zombie doc. otherwise
// the onload will be delayed by other loads initiated in the
// background by the first document that
// didn't fully load before the next load was initiated.
// If not a zombie, don't stop content until data
// starts arriving from the new URI...
nsCOMPtr<nsIContentViewer> zombieViewer;
if (mContentViewer) {
mContentViewer->GetPreviousViewer(getter_AddRefs(zombieViewer));
}
if (zombieViewer) {
rv = Stop(nsIWebNavigation::STOP_ALL);
} else {
rv = Stop(nsIWebNavigation::STOP_NETWORK);
}
if (NS_FAILED(rv))
return rv;
mLoadType = aLoadType;
// mLSHE should be assigned to aSHEntry, only after Stop() has