mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
Bug 939896 part 6: Make ComputeFlexContainerMainSize take a FlexLine. r=mats
This commit is contained in:
parent
ed995fc8c7
commit
6263ab32c1
@ -2034,7 +2034,7 @@ nscoord
|
||||
nsFlexContainerFrame::ComputeFlexContainerMainSize(
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
const FlexboxAxisTracker& aAxisTracker,
|
||||
const nsTArray<FlexItem>& aItems,
|
||||
const FlexLine& aLine,
|
||||
nscoord aAvailableHeightForContent,
|
||||
nsReflowStatus& aStatus)
|
||||
{
|
||||
@ -2065,7 +2065,7 @@ nsFlexContainerFrame::ComputeFlexContainerMainSize(
|
||||
// our children" is just the sum of our children's heights.
|
||||
NS_FRAME_SET_INCOMPLETE(aStatus);
|
||||
nscoord sumOfChildHeights =
|
||||
SumFlexItemMarginBoxMainSizes(aAxisTracker, aItems);
|
||||
SumFlexItemMarginBoxMainSizes(aAxisTracker, aLine.mItems);
|
||||
if (sumOfChildHeights <= aAvailableHeightForContent) {
|
||||
return aAvailableHeightForContent;
|
||||
}
|
||||
@ -2078,7 +2078,7 @@ nsFlexContainerFrame::ComputeFlexContainerMainSize(
|
||||
// properties (min-height & max-height).
|
||||
// XXXdholbert Handle constrained-aAvailableHeightForContent case here.
|
||||
nscoord sumOfChildHeights =
|
||||
SumFlexItemMarginBoxMainSizes(aAxisTracker, aItems);
|
||||
SumFlexItemMarginBoxMainSizes(aAxisTracker, aLine.mItems);
|
||||
return NS_CSS_MINMAX(sumOfChildHeights,
|
||||
aReflowState.mComputedMinHeight,
|
||||
aReflowState.mComputedMaxHeight);
|
||||
@ -2374,7 +2374,7 @@ nsFlexContainerFrame::Reflow(nsPresContext* aPresContext,
|
||||
}
|
||||
|
||||
const nscoord contentBoxMainSize =
|
||||
ComputeFlexContainerMainSize(aReflowState, axisTracker, line.mItems,
|
||||
ComputeFlexContainerMainSize(aReflowState, axisTracker, line,
|
||||
availableHeightForContent, aStatus);
|
||||
|
||||
ResolveFlexibleLengths(axisTracker, contentBoxMainSize, line.mItems);
|
||||
|
@ -107,7 +107,7 @@ protected:
|
||||
|
||||
nscoord ComputeFlexContainerMainSize(const nsHTMLReflowState& aReflowState,
|
||||
const FlexboxAxisTracker& aAxisTracker,
|
||||
const nsTArray<FlexItem>& aFlexItems,
|
||||
const FlexLine& aLine,
|
||||
nscoord aAvailableHeightForContent,
|
||||
nsReflowStatus& aStatus);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user