Bug 865602 - FieldSet block may be null for overflow containers. r=roc

This commit is contained in:
Mats Palmgren 2013-04-29 14:11:03 +02:00
parent 1a9953c85c
commit d29548fd77
3 changed files with 19 additions and 5 deletions

View File

@ -8786,11 +8786,15 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext,
// Create a continuing area frame
// XXXbz we really shouldn't have to do this by hand!
nsIFrame* blockFrame = GetFieldSetBlockFrame(aFrame);
nsIFrame* continuingBlockFrame =
CreateContinuingFrame(aPresContext, blockFrame, newFrame);
// Set the fieldset's initial child list
SetInitialSingleChild(newFrame, continuingBlockFrame);
if (blockFrame) {
nsIFrame* continuingBlockFrame =
CreateContinuingFrame(aPresContext, blockFrame, newFrame);
// Set the fieldset's initial child list
SetInitialSingleChild(newFrame, continuingBlockFrame);
} else {
MOZ_ASSERT(aFrame->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER,
"FieldSet block may only be null for overflow containers");
}
} else if (nsGkAtoms::legendFrame == frameType) {
newFrame = NS_NewLegendFrame(shell, styleContext);
newFrame->Init(content, aParentFrame, aFrame);

View File

@ -0,0 +1,9 @@
<!DOCTYPE html>
<html><body>
<div style="-moz-column-count: 2;"><fieldset style="transform-style: preserve-3d;"><fieldset style="white-space: pre-line; position: fixed;"><div style="position: fixed;">
</div></fieldset></fieldset></div>
</body></html>

View File

@ -48,3 +48,4 @@ asserts(4-7) load 590302-1.xhtml # bug 584564
load 626014.xhtml
load 639733.xhtml
asserts(0-1) load 669767.html
load 865602.html