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

Bug 319463 - display:none iframe pointing to a xul document stops main document from finishing to load. patch by ben, r=bz sr=bryner

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@187106 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
doronr%us.ibm.com 2006-01-06 23:24:38 +00:00
parent f1f960fbc8
commit 6477e29d8b
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/content/xul/document/src/nsXULDocument.cpp
View File

@ -3071,15 +3071,7 @@ nsXULDocument::ResumeWalk()
// XXXldb This is where we should really be setting the chromehidden
// attribute.
PRBool didInitialReflow = PR_TRUE;
nsIPresShell *shell = GetShellAt(0);
if (shell)
shell->GetDidInitialReflow(&didInitialReflow);
if (!didInitialReflow) {
// Everything after this point we only want to do once we're
// certain that we've been embedded in a presentation shell.
if (!mDocumentLoaded) {
nsAutoString title;
mRootContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::title, title);
SetTitle(title);
@ -3113,6 +3105,8 @@ nsXULDocument::ResumeWalk()
// See below for detail.
if (mPendingOverlayLoadNotifications.IsInitialized())
mPendingOverlayLoadNotifications.Enumerate(FirePendingMergeNotification, (void*)&mOverlayLoadObservers);
mDocumentLoaded = true;
}
else {
if (mOverlayLoadObservers.IsInitialized()) {

1
mozilla/content/xul/document/src/nsXULDocument.h
View File

@ -263,6 +263,7 @@ protected:
PRPackedBool mIsFastLoad;
PRPackedBool mApplyingPersistedAttrs;
PRPackedBool mIsWritingFastLoad;
PRPackedBool mDocumentLoaded;
nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker
// Maintains the template builders that have been attached to