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

Bug 400185, crash with popupgroup, disallow using popupgroups and only create a frame for the native anonymous one, r+sr=bz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@241847 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
enndeakin%sympatico.ca
2007-12-20 14:46:12 +00:00
parent 3bf237ac0a
commit 250bba3bce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -5946,7 +5946,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState,
newFrame = NS_NewMenuBarFrame(mPresShell, aStyleContext);
}
else if (aTag == nsGkAtoms::popupgroup) {
else if (aTag == nsGkAtoms::popupgroup && aContent->IsNativeAnonymous()) {
// This frame contains child popups
newFrame = NS_NewPopupSetFrame(mPresShell, aStyleContext);
}
@@ -6208,7 +6208,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState,
}
#ifdef MOZ_XUL
if (aTag == nsGkAtoms::popupgroup) {
if (aTag == nsGkAtoms::popupgroup && aContent->IsNativeAnonymous()) {
nsIRootBox* rootBox = nsIRootBox::GetRootBox(mPresShell);
if (rootBox) {
NS_ASSERTION(rootBox->GetPopupSetFrame() == newFrame,