Fix build bustage for --disable-xul. Bug 349921

This commit is contained in:
bzbarsky%mit.edu 2006-08-30 18:04:27 +00:00
Родитель d64e3427a6
Коммит 432b5c8cce
1 изменённых файлов: 18 добавлений и 5 удалений

Просмотреть файл

@ -1120,8 +1120,10 @@ public:
// Whether the parent is a block (see ProcessChildren's aParentIsBlock) // Whether the parent is a block (see ProcessChildren's aParentIsBlock)
PRBool mCreatorIsBlock; PRBool mCreatorIsBlock;
#ifdef MOZ_XUL
// The root box, if any. // The root box, if any.
nsIRootBox* mRootBox; nsIRootBox* mRootBox;
#endif
// Constructor // Constructor
// Use the passed-in history state. // Use the passed-in history state.
@ -1232,8 +1234,10 @@ nsFrameConstructorState::nsFrameConstructorState(nsIPresShell* aPresShe
mPseudoFrames(), mPseudoFrames(),
mAnonymousCreator(nsnull), mAnonymousCreator(nsnull),
mInsertionContent(nsnull), mInsertionContent(nsnull),
mCreatorIsBlock(PR_FALSE), mCreatorIsBlock(PR_FALSE)
mRootBox(nsIRootBox::GetRootBox(aPresShell)) #ifdef MOZ_XUL
, mRootBox(nsIRootBox::GetRootBox(aPresShell))
#endif
{ {
} }
@ -1252,8 +1256,10 @@ nsFrameConstructorState::nsFrameConstructorState(nsIPresShell* aPresShell,
mPseudoFrames(), mPseudoFrames(),
mAnonymousCreator(nsnull), mAnonymousCreator(nsnull),
mInsertionContent(nsnull), mInsertionContent(nsnull),
mCreatorIsBlock(PR_FALSE), mCreatorIsBlock(PR_FALSE)
mRootBox(nsIRootBox::GetRootBox(aPresShell)) #ifdef MOZ_XUL
, mRootBox(nsIRootBox::GetRootBox(aPresShell))
#endif
{ {
mFrameState = aPresShell->GetDocument()->GetLayoutHistoryState(); mFrameState = aPresShell->GetDocument()->GetLayoutHistoryState();
} }
@ -1425,6 +1431,7 @@ nsFrameConstructorState::AddChild(nsIFrame* aNewFrame,
} }
#endif #endif
#ifdef MOZ_XUL
if (NS_UNLIKELY(aIsOutOfFlowPopup)) { if (NS_UNLIKELY(aIsOutOfFlowPopup)) {
NS_ASSERTION(mRootBox && mRootBox->GetPopupSetFrame(), NS_ASSERTION(mRootBox && mRootBox->GetPopupSetFrame(),
"Must have a popup set frame!"); "Must have a popup set frame!");
@ -1432,6 +1439,7 @@ nsFrameConstructorState::AddChild(nsIFrame* aNewFrame,
aNewFrame); aNewFrame);
} }
#endif
frameItems->AddChild(aNewFrame); frameItems->AddChild(aNewFrame);
@ -6485,13 +6493,18 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState,
// xul does not support absolute positioning // xul does not support absolute positioning
nsIFrame* geometricParent; nsIFrame* geometricParent;
#ifdef MOZ_XUL
if (isPopup) { if (isPopup) {
NS_ASSERTION(aState.mRootBox && aState.mRootBox->GetPopupSetFrame(), NS_ASSERTION(aState.mRootBox && aState.mRootBox->GetPopupSetFrame(),
"How did we get here?"); "How did we get here?");
geometricParent = aState.mRootBox->GetPopupSetFrame(); geometricParent = aState.mRootBox->GetPopupSetFrame();
} else { }
else
#else
{
geometricParent = aParentFrame; geometricParent = aParentFrame;
} }
#endif
/* /*
nsIFrame* geometricParent = aState.GetGeometricParent(display, aParentFrame); nsIFrame* geometricParent = aState.GetGeometricParent(display, aParentFrame);