From 250bba3bcef5b29646bf68b9252270217ffbb62c Mon Sep 17 00:00:00 2001 From: "enndeakin%sympatico.ca" Date: Thu, 20 Dec 2007 14:46:12 +0000 Subject: [PATCH] Bug 400185, crash with popupgroup, disallow using popupgroups and only create a frame for the native anonymous one, r+sr=bz git-svn-id: svn://10.0.0.236/trunk@241847 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 4423a19cc8b..b73766cbbd8 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -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,