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

partially revert rev 1.530 because of regression bug 201108. this will also be on the 1.4 branch. code=radha r=darin,me

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@142829 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm%netscape.com
2003-05-23 21:42:23 +00:00
parent dc7e857400
commit bf7a22089b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -658,12 +658,12 @@ nsDocShell::LoadURI(nsIURI * aURI,
// This is a pre-existing subframe. If the load was not originally initiated
// by session history, (if (!shEntry) condition succeeded) and mCurrentURI is not null,
// it is possible that a parent's onLoadHandler or even self's onLoadHandler is loading
// a new page in this child. Check parent's and self's onLoadHandler flag and if it is set,
// a new page in this child. Check parent's and self's busy flag and if it is set,
// we don't want this onLoadHandler load to get in to session history.
PRBool parentInOnLoadHandler=PR_FALSE, selfInOnLoadHandler = PR_FALSE;
parentDS->GetIsExecutingOnLoadHandler(&parentInOnLoadHandler);
GetIsExecutingOnLoadHandler(&selfInOnLoadHandler);
if ((parentInOnLoadHandler || selfInOnLoadHandler) && shEntry) {
PRUint32 parentBusy=BUSY_FLAGS_NONE, selfBusy = BUSY_FLAGS_NONE;
parentDS->GetBusyFlags(&parentBusy);
GetBusyFlags(&selfBusy);
if (((parentBusy & BUSY_FLAGS_BUSY) || (selfBusy & BUSY_FLAGS_BUSY)) && shEntry) {
loadType = LOAD_NORMAL_REPLACE;
shEntry = nsnull;
}