Bug 1037177 part 4: Call ResolveAutoFlexBasisAndMinSize at the end of GenerateFlexItemForChild, instead of just after it. r=mats

This commit is contained in:
Daniel Holbert 2014-07-22 08:24:36 -07:00
parent 9fb7acb17b
commit 3226ed5912

View File

@ -1030,6 +1030,11 @@ nsFlexContainerFrame::GenerateFlexItemForChild(
item->Freeze();
}
// Resolve "flex-basis:auto" and/or "min-height:auto" (which might
// require us to reflow the item to measure content height)
ResolveAutoFlexBasisAndMinSize(aPresContext, *item,
aParentReflowState, aAxisTracker);
return item;
}
@ -2706,9 +2711,6 @@ nsFlexContainerFrame::GenerateFlexLines(
} else {
item = GenerateFlexItemForChild(aPresContext, childFrame,
aReflowState, aAxisTracker);
ResolveAutoFlexBasisAndMinSize(aPresContext, *item,
aReflowState, aAxisTracker);
}
nscoord itemInnerHypotheticalMainSize = item->GetMainSize();