wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 939896 part 6: Make ComputeFlexContainerMainSize take a FlexLine. r=mats

Browse Source
This commit is contained in:
Daniel Holbert 2013-11-26 10:27:52 -08:00
parent d108bffd8c
commit 648997d8bb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsFlexContainerFrame.cpp
View File

@ -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);

2
layout/generic/nsFlexContainerFrame.h
View File

@ -107,7 +107,7 @@ protected:
nscoord ComputeFlexContainerMainSize(const nsHTMLReflowState& aReflowState,
const FlexboxAxisTracker& aAxisTracker,
const nsTArray<FlexItem>& aFlexItems,
const FlexLine& aLine,
nscoord aAvailableHeightForContent,
nsReflowStatus& aStatus);