diff options
Diffstat (limited to 'layout/generic/nsFlexContainerFrame.cpp')
| -rw-r--r-- | layout/generic/nsFlexContainerFrame.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index 4429111e46..18a0643f14 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -1856,7 +1856,7 @@ nsFlexContainerFrame::MeasureAscentAndHeightForFlexItem( ReflowOutput childDesiredSize(aChildReflowInput); nsReflowStatus childReflowStatus; - const uint32_t flags = NS_FRAME_NO_MOVE_FRAME; + const ReflowChildFlags flags = ReflowChildFlags::NoMoveFrame; ReflowChild(aItem.Frame(), aPresContext, childDesiredSize, aChildReflowInput, 0, 0, flags, childReflowStatus); @@ -4856,7 +4856,8 @@ nsFlexContainerFrame::ReflowFlexItem(nsPresContext* aPresContext, ReflowChild(aItem.Frame(), aPresContext, childDesiredSize, childReflowInput, outerWM, aFramePos, aContainerSize, - 0, childReflowStatus); + ReflowChildFlags::Default, + childReflowStatus); // XXXdholbert Once we do pagination / splitting, we'll need to actually // handle incomplete childReflowStatuses. But for now, we give our kids @@ -4872,9 +4873,9 @@ nsFlexContainerFrame::ReflowFlexItem(nsPresContext* aPresContext, offsets, &aFramePos, aContainerSize); - FinishReflowChild(aItem.Frame(), aPresContext, - childDesiredSize, &childReflowInput, - outerWM, aFramePos, aContainerSize, 0); + FinishReflowChild(aItem.Frame(), aPresContext, childDesiredSize, + &childReflowInput, outerWM, aFramePos, aContainerSize, + ReflowChildFlags::Default); aItem.SetAscent(childDesiredSize.BlockStartAscent()); } @@ -4899,14 +4900,13 @@ nsFlexContainerFrame::ReflowPlaceholders(nsPresContext* aPresContext, placeholder, availSize); ReflowOutput childDesiredSize(childReflowInput); nsReflowStatus childReflowStatus; - ReflowChild(placeholder, aPresContext, - childDesiredSize, childReflowInput, - outerWM, aContentBoxOrigin, aContainerSize, 0, - childReflowStatus); - - FinishReflowChild(placeholder, aPresContext, - childDesiredSize, &childReflowInput, - outerWM, aContentBoxOrigin, aContainerSize, 0); + ReflowChild(placeholder, aPresContext, childDesiredSize, childReflowInput, + outerWM, aContentBoxOrigin, aContainerSize, + ReflowChildFlags::Default, childReflowStatus); + + FinishReflowChild(placeholder, aPresContext, childDesiredSize, + &childReflowInput, outerWM, aContentBoxOrigin, + aContainerSize, ReflowChildFlags::Default); // Mark the placeholder frame to indicate that it's not actually at the // element's static position, because we need to apply CSS Alignment after |