diff --git a/layout/generic/nsIFrame.cpp b/layout/generic/nsIFrame.cpp index c0d72ccdc35e..a92f0e990172 100644 --- a/layout/generic/nsIFrame.cpp +++ b/layout/generic/nsIFrame.cpp @@ -7375,10 +7375,8 @@ void nsIFrame::DidReflow(nsPresContext* aPresContext, void nsIFrame::FinishReflowWithAbsoluteFrames(nsPresContext* aPresContext, ReflowOutput& aDesiredSize, const ReflowInput& aReflowInput, - nsReflowStatus& aStatus, - bool aConstrainBSize) { - ReflowAbsoluteFrames(aPresContext, aDesiredSize, aReflowInput, aStatus, - aConstrainBSize); + nsReflowStatus& aStatus) { + ReflowAbsoluteFrames(aPresContext, aDesiredSize, aReflowInput, aStatus); FinishAndStoreOverflow(&aDesiredSize, aReflowInput.mStyleDisplay); } @@ -7386,8 +7384,7 @@ void nsIFrame::FinishReflowWithAbsoluteFrames(nsPresContext* aPresContext, void nsIFrame::ReflowAbsoluteFrames(nsPresContext* aPresContext, ReflowOutput& aDesiredSize, const ReflowInput& aReflowInput, - nsReflowStatus& aStatus, - bool aConstrainBSize) { + nsReflowStatus& aStatus) { if (HasAbsolutelyPositionedChildren()) { nsAbsoluteContainingBlock* absoluteContainer = GetAbsoluteContainingBlock(); @@ -7406,10 +7403,8 @@ void nsIFrame::ReflowAbsoluteFrames(nsPresContext* aPresContext, nsRect containingBlock(0, 0, containingBlockWidth, containingBlockHeight); AbsPosReflowFlags flags = - AbsPosReflowFlags::CBWidthAndHeightChanged; // XXX could be optimized - if (aConstrainBSize) { - flags |= AbsPosReflowFlags::ConstrainHeight; - } + AbsPosReflowFlags::CBWidthAndHeightChanged | // XXX could be optimized + AbsPosReflowFlags::ConstrainHeight; absoluteContainer->Reflow(container, aPresContext, aReflowInput, aStatus, containingBlock, flags, &aDesiredSize.mOverflowAreas); diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 12a6f91774b2..a7e263506450 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -3160,8 +3160,7 @@ class nsIFrame : public nsQueryFrame { void FinishReflowWithAbsoluteFrames(nsPresContext* aPresContext, ReflowOutput& aDesiredSize, const ReflowInput& aReflowInput, - nsReflowStatus& aStatus, - bool aConstrainBSize = true); + nsReflowStatus& aStatus); /** * Updates the overflow areas of the frame. This can be called if an @@ -4564,8 +4563,7 @@ class nsIFrame : public nsQueryFrame { void ReflowAbsoluteFrames(nsPresContext* aPresContext, ReflowOutput& aDesiredSize, const ReflowInput& aReflowInput, - nsReflowStatus& aStatus, - bool aConstrainBSize = true); + nsReflowStatus& aStatus); private: nscoord ComputeISizeValueFromAspectRatio( diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 360984b3a074..d5c4a10d4b59 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -1862,8 +1862,8 @@ void nsTableFrame::FixupPositionedTableParts(nsPresContext* aPresContext, // FIXME: Unconditionally using NS_UNCONSTRAINEDSIZE for the bsize and // ignoring any change to the reflow status aren't correct. We'll never // paginate absolutely positioned frames. - positionedPart->FinishReflowWithAbsoluteFrames( - PresContext(), desiredSize, reflowInput, reflowStatus, true); + positionedPart->FinishReflowWithAbsoluteFrames(PresContext(), desiredSize, + reflowInput, reflowStatus); // FinishReflowWithAbsoluteFrames has updated overflow on // |positionedPart|. We need to make sure that update propagates