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

Bug 121860. Handle case where block frame is embedded inside a XUL document. r=dbaron, sr=hyatt.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@113067 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2002-01-29 00:02:25 +00:00
parent 1bfbb1a79e
commit 3229841ba0
2 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3219,14 +3219,15 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell,
nsFrameConstructorSaveState floaterSaveState;
nsFrameItems childItems;
// XXX these next lines are wrong for BoxFrame
PRBool haveFirstLetterStyle, haveFirstLineStyle;
HaveSpecialBlockStyle(aPresContext, aDocElement, styleContext,
&haveFirstLetterStyle, &haveFirstLineStyle);
aState.PushAbsoluteContainingBlock(contentFrame, absoluteSaveState);
aState.PushFloaterContainingBlock(contentFrame, floaterSaveState,
haveFirstLetterStyle,
haveFirstLineStyle);
if (isBlockFrame) {
PRBool haveFirstLetterStyle, haveFirstLineStyle;
HaveSpecialBlockStyle(aPresContext, aDocElement, styleContext,
&haveFirstLetterStyle, &haveFirstLineStyle);
aState.PushAbsoluteContainingBlock(contentFrame, absoluteSaveState);
aState.PushFloaterContainingBlock(contentFrame, floaterSaveState,
haveFirstLetterStyle,
haveFirstLineStyle);
}
// Create any anonymous frames the doc element frame requires
// This must happen before ProcessChildren to ensure that popups are
@@ -13154,6 +13155,21 @@ nsCSSFrameConstructor::ConstructBlock(nsIPresShell* aPresShell,
nsHTMLContainerFrame::CreateViewForFrame(aPresContext, aNewFrame,
aStyleContext, nsnull, PR_FALSE);
// If we're the first block to be created (e.g., because we're
// contained inside a XUL document), then make sure that we've got a
// space manager so we can handle floaters...
if (! aState.mFloatedItems.containingBlock) {
nsFrameState state;
aNewFrame->GetFrameState(&state);
state |= NS_BLOCK_SPACE_MGR | NS_BLOCK_MARGIN_ROOT;
aNewFrame->SetFrameState(state);
}
// ...and that we're the absolute containing block.
nsFrameConstructorSaveState absoluteSaveState;
if (! aState.mAbsoluteItems.containingBlock)
aState.PushAbsoluteContainingBlock(aNewFrame, absoluteSaveState);
// See if the block has first-letter style applied to it...
PRBool haveFirstLetterStyle, haveFirstLineStyle;
HaveSpecialBlockStyle(aPresContext, aContent, aStyleContext,