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 959874 - Reorder two parameters in nsContainerFrame::FinishReflowChild(), for consistency with nsContainerFrame::ReflowChild(). r=dholbert

Browse Source
This commit is contained in:
Peiyong Lin 2014-01-16 17:34:44 -08:00
parent bd5ead0e51
commit e0dbe148bc
38 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/forms/nsComboboxControlFrame.cpp
View File

@ -446,8 +446,8 @@ nsComboboxControlFrame::ReflowDropdown(nsPresContext* aPresContext,
ignoredStatus);
// Set the child's width and height to its desired size
FinishReflowChild(mDropdownFrame, aPresContext, &kidReflowState,
desiredSize, rect.x, rect.y, flags);
FinishReflowChild(mDropdownFrame, aPresContext, desiredSize,
&kidReflowState, rect.x, rect.y, flags);
return rv;
}

8
layout/forms/nsFieldSetFrame.cpp
View File

@ -512,8 +512,8 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
reflowInner = true;
}
FinishReflowChild(legend, aPresContext, &legendReflowState.ref(),
legendDesiredSize, 0, 0, NS_FRAME_NO_MOVE_FRAME);
FinishReflowChild(legend, aPresContext, legendDesiredSize,
&legendReflowState.ref(), 0, 0, NS_FRAME_NO_MOVE_FRAME);
} else if (!legend) {
mLegendRect.SetEmpty();
mLegendSpace = 0;
@ -557,8 +557,8 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
ReflowChild(inner, aPresContext, kidDesiredSize, kidReflowState,
pt.x, pt.y, 0, aStatus);
FinishReflowChild(inner, aPresContext, &kidReflowState,
kidDesiredSize, pt.x, pt.y, 0);
FinishReflowChild(inner, aPresContext, kidDesiredSize,
&kidReflowState, pt.x, pt.y, 0);
NS_FRAME_TRACE_REFLOW_OUT("FieldSet::Reflow", aStatus);
}

2
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@ -329,7 +329,7 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
// Place the child
FinishReflowChild(aFirstKid, aPresContext,
&contentsReflowState, contentsDesiredSize,
contentsDesiredSize, &contentsReflowState,
xoffset, yoffset, 0);
// Make sure we have a useful 'ascent' value for the child

2
layout/forms/nsMeterFrame.cpp
View File

@ -182,7 +182,7 @@ nsMeterFrame::ReflowBarFrame(nsIFrame* aBarFrame,
nsHTMLReflowMetrics barDesiredSize(reflowState.GetWritingMode());
ReflowChild(aBarFrame, aPresContext, barDesiredSize, reflowState, xoffset,
yoffset, 0, aStatus);
FinishReflowChild(aBarFrame, aPresContext, &reflowState, barDesiredSize,
FinishReflowChild(aBarFrame, aPresContext, barDesiredSize, &reflowState,
xoffset, yoffset, 0);
}

2
layout/forms/nsNumberControlFrame.cpp
View File

@ -150,7 +150,7 @@ nsNumberControlFrame::
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(childStatus),
"We gave our child unconstrained height, so it should be complete");
return FinishReflowChild(aOuterWrapperFrame, aPresContext,
&wrapperReflowState, aWrappersDesiredSize,
aWrappersDesiredSize, &wrapperReflowState,
xoffset, yoffset, 0);
}

2
layout/forms/nsProgressFrame.cpp
View File

@ -196,7 +196,7 @@ nsProgressFrame::ReflowBarFrame(nsIFrame* aBarFrame,
nsHTMLReflowMetrics barDesiredSize(aReflowState.GetWritingMode());
ReflowChild(aBarFrame, aPresContext, barDesiredSize, reflowState, xoffset,
yoffset, 0, aStatus);
FinishReflowChild(aBarFrame, aPresContext, &reflowState, barDesiredSize,
FinishReflowChild(aBarFrame, aPresContext, barDesiredSize, &reflowState,
xoffset, yoffset, 0);
}

10
layout/forms/nsRangeFrame.cpp
View File

@ -356,8 +356,8 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
NS_ENSURE_SUCCESS(rv, rv);
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
"We gave our child unconstrained height, so it should be complete");
rv = FinishReflowChild(trackFrame, aPresContext, &trackReflowState,
trackDesiredSize, trackX, trackY, 0);
rv = FinishReflowChild(trackFrame, aPresContext, trackDesiredSize,
&trackReflowState, trackX, trackY, 0);
NS_ENSURE_SUCCESS(rv, rv);
}
@ -378,8 +378,8 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
NS_ENSURE_SUCCESS(rv, rv);
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
"We gave our child unconstrained height, so it should be complete");
rv = FinishReflowChild(thumbFrame, aPresContext, &thumbReflowState,
thumbDesiredSize, 0, 0, 0);
rv = FinishReflowChild(thumbFrame, aPresContext, thumbDesiredSize,
&thumbReflowState, 0, 0, 0);
NS_ENSURE_SUCCESS(rv, rv);
DoUpdateThumbPosition(thumbFrame, nsSize(aDesiredSize.Width(),
@ -407,7 +407,7 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
"We gave our child unconstrained height, so it should be complete");
rv = FinishReflowChild(rangeProgressFrame, aPresContext,
&progressReflowState, progressDesiredSize, 0, 0, 0);
progressDesiredSize, &progressReflowState, 0, 0, 0);
NS_ENSURE_SUCCESS(rv, rv);
DoUpdateRangeProgressFrame(rangeProgressFrame, nsSize(aDesiredSize.Width(),

4
layout/forms/nsTextControlFrame.cpp
View File

@ -549,8 +549,8 @@ nsTextControlFrame::ReflowTextControlChild(nsIFrame* aKid,
xOffset, yOffset, 0, aStatus);
// place the child
FinishReflowChild(aKid, aPresContext, &kidReflowState,
desiredSize, xOffset, yOffset, 0);
FinishReflowChild(aKid, aPresContext, desiredSize,
&kidReflowState, xOffset, yOffset, 0);
// consider the overflow
aParentDesiredSize.mOverflowAreas.UnionWith(desiredSize.mOverflowAreas);

4
layout/generic/nsBlockReflowContext.cpp
View File

@ -392,8 +392,8 @@ nsBlockReflowContext::PlaceBlock(const nsHTMLReflowState& aReflowState,
aReflowState.ApplyRelativePositioning(&position);
// Now place the frame and complete the reflow process
nsContainerFrame::FinishReflowChild(mFrame, mPresContext, &aReflowState,
mMetrics, position.x, position.y, 0);
nsContainerFrame::FinishReflowChild(mFrame, mPresContext, mMetrics,
&aReflowState, position.x, position.y, 0);
aOverflowAreas = mMetrics.mOverflowAreas + position;

2
layout/generic/nsCanvasFrame.cpp
View File

@ -521,7 +521,7 @@ nsCanvasFrame::Reflow(nsPresContext* aPresContext,
kidPt.x, kidPt.y, 0, aStatus);
// Complete the reflow and position and size the child frame
FinishReflowChild(kidFrame, aPresContext, &kidReflowState, kidDesiredSize,
FinishReflowChild(kidFrame, aPresContext, kidDesiredSize, &kidReflowState,
kidPt.x, kidPt.y, 0);
if (!NS_FRAME_IS_FULLY_COMPLETE(aStatus)) {

4
layout/generic/nsColumnSetFrame.cpp
View File

@ -591,8 +591,8 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
*aBottomMarginCarriedOut = kidDesiredSize.mCarriedOutBottomMargin;
FinishReflowChild(child, PresContext(), &kidReflowState,
kidDesiredSize, childOrigin.x, childOrigin.y, 0);
FinishReflowChild(child, PresContext(), kidDesiredSize,
&kidReflowState, childOrigin.x, childOrigin.y, 0);
childContentBottom = nsLayoutUtils::CalculateContentBottom(child);
if (childContentBottom > aConfig.mColMaxHeight) {

4
layout/generic/nsContainerFrame.cpp
View File

@ -1034,8 +1034,8 @@ nsContainerFrame::PositionChildViews(nsIFrame* aFrame)
nsresult
nsContainerFrame::FinishReflowChild(nsIFrame* aKidFrame,
nsPresContext* aPresContext,
const nsHTMLReflowState* aReflowState,
const nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState* aReflowState,
nscoord aX,
nscoord aY,
uint32_t aFlags)
@ -1158,7 +1158,7 @@ nsContainerFrame::ReflowOverflowContainerChildren(nsPresContext* aPres
NS_ENSURE_SUCCESS(rv, rv);
//XXXfr Do we need to override any shrinkwrap effects here?
// e.g. desiredSize.Width() = prevRect.width;
rv = FinishReflowChild(frame, aPresContext, &frameState, desiredSize,
rv = FinishReflowChild(frame, aPresContext, desiredSize, &frameState,
prevRect.x, 0, aFlags);
NS_ENSURE_SUCCESS(rv, rv);

2
layout/generic/nsContainerFrame.h
View File

@ -227,8 +227,8 @@ public:
*/
static nsresult FinishReflowChild(nsIFrame* aKidFrame,
nsPresContext* aPresContext,
const nsHTMLReflowState* aReflowState,
const nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState* aReflowState,
nscoord aX,
nscoord aY,
uint32_t aFlags);

6
layout/generic/nsFlexContainerFrame.cpp
View File

@ -953,7 +953,7 @@ nsFlexContainerFrame::
"should be complete");
rv = FinishReflowChild(aFlexItem.Frame(), aPresContext,
&childRSForMeasuringHeight, childDesiredSize,
childDesiredSize, &childRSForMeasuringHeight,
0, 0, flags);
NS_ENSURE_SUCCESS(rv, rv);
@ -2526,7 +2526,7 @@ nsFlexContainerFrame::SizeItemInCrossAxis(
// Tell the child we're done with its initial reflow.
// (Necessary for e.g. GetBaseline() to work below w/out asserting)
rv = FinishReflowChild(aItem.Frame(), aPresContext,
&aChildReflowState, childDesiredSize, 0, 0, flags);
childDesiredSize, &aChildReflowState, 0, 0, flags);
NS_ENSURE_SUCCESS(rv, rv);
// Save the sizing info that we learned from this reflow
@ -2863,7 +2863,7 @@ nsFlexContainerFrame::Reflow(nsPresContext* aPresContext,
childReflowState.ApplyRelativePositioning(&physicalPosn);
rv = FinishReflowChild(curItem.Frame(), aPresContext,
&childReflowState, childDesiredSize,
childDesiredSize, &childReflowState,
physicalPosn.x, physicalPosn.y, 0);
NS_ENSURE_SUCCESS(rv, rv);

4
layout/generic/nsFrame.cpp
View File

@ -7975,8 +7975,8 @@ nsFrame::BoxReflow(nsBoxLayoutState& aState,
NS_ASSERTION(NS_FRAME_IS_COMPLETE(status), "bad status");
uint32_t layoutFlags = aState.LayoutFlags();
nsContainerFrame::FinishReflowChild(this, aPresContext, &reflowState,
aDesiredSize, aX, aY, layoutFlags | NS_FRAME_NO_MOVE_FRAME);
nsContainerFrame::FinishReflowChild(this, aPresContext, aDesiredSize,
&reflowState, aX, aY, layoutFlags | NS_FRAME_NO_MOVE_FRAME);
// Save the ascent. (bug 103925)
if (IsCollapsed()) {

2
layout/generic/nsFrameSetFrame.cpp
View File

@ -751,7 +751,7 @@ nsHTMLFramesetFrame::ReflowPlaceChild(nsIFrame* aChild,
// Place and size the child
metrics.Width() = aSize.width;
metrics.Height() = aSize.height;
FinishReflowChild(aChild, aPresContext, nullptr, metrics, aOffset.x, aOffset.y, 0);
FinishReflowChild(aChild, aPresContext, metrics, nullptr, aOffset.x, aOffset.y, 0);
}
static

2
layout/generic/nsGfxScrollFrame.cpp
View File

@ -467,7 +467,7 @@ nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowState* aState,
// which will usually be different from the scrollport height;
// invalidating the difference will cause unnecessary repainting.
FinishReflowChild(mHelper.mScrolledFrame, presContext,
&kidReflowState, *aMetrics, 0, 0,
*aMetrics, &kidReflowState, 0, 0,
NS_FRAME_NO_MOVE_FRAME | NS_FRAME_NO_SIZE_VIEW);
// XXX Some frames (e.g., nsObjectFrame, nsFrameFrame, nsTextFrame) don't bother

4
layout/generic/nsHTMLCanvasFrame.cpp
View File

@ -214,8 +214,8 @@ nsHTMLCanvasFrame::Reflow(nsPresContext* aPresContext,
availSize);
ReflowChild(childFrame, aPresContext, childDesiredSize, childReflowState,
0, 0, 0, childStatus, nullptr);
FinishReflowChild(childFrame, aPresContext, &childReflowState,
childDesiredSize, 0, 0, 0);
FinishReflowChild(childFrame, aPresContext, childDesiredSize,
&childReflowState, 0, 0, 0);
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("exit nsHTMLCanvasFrame::Reflow: size=%d,%d",

2
layout/generic/nsPageContentFrame.cpp
View File

@ -81,7 +81,7 @@ nsPageContentFrame::Reflow(nsPresContext* aPresContext,
}
// Place and size the child
FinishReflowChild(frame, aPresContext, &kidReflowState, aDesiredSize, 0, 0, 0);
FinishReflowChild(frame, aPresContext, aDesiredSize, &kidReflowState, 0, 0, 0);
NS_ASSERTION(aPresContext->IsDynamic() || !NS_FRAME_IS_FULLY_COMPLETE(aStatus) ||
!frame->GetNextInFlow(), "bad child flow list");

2
layout/generic/nsPageFrame.cpp
View File

@ -138,7 +138,7 @@ NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext* aPresContext,
ReflowChild(frame, aPresContext, aDesiredSize, kidReflowState, xc, yc, 0, aStatus);
// Place and size the child
FinishReflowChild(frame, aPresContext, &kidReflowState, aDesiredSize, xc, yc, 0);
FinishReflowChild(frame, aPresContext, aDesiredSize, &kidReflowState, xc, yc, 0);
NS_ASSERTION(!NS_FRAME_IS_FULLY_COMPLETE(aStatus) ||
!frame->GetNextInFlow(), "bad child flow list");

2
layout/generic/nsSimplePageSequence.cpp
View File

@ -223,7 +223,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext,
// max width then center it horizontally
ReflowChild(kidFrame, aPresContext, kidSize, kidReflowState, x, y, 0, status);
FinishReflowChild(kidFrame, aPresContext, nullptr, kidSize, x, y, 0);
FinishReflowChild(kidFrame, aPresContext, kidSize, nullptr, x, y, 0);
y += kidSize.Height();
y += pageCSSMargin.bottom;

4
layout/generic/nsVideoFrame.cpp
View File

@ -306,7 +306,7 @@ nsVideoFrame::Reflow(nsPresContext* aPresContext,
ReflowChild(imageFrame, aPresContext, kidDesiredSize, kidReflowState,
posterTopLeft.x, posterTopLeft.y, 0, aStatus);
FinishReflowChild(imageFrame, aPresContext, &kidReflowState, kidDesiredSize,
FinishReflowChild(imageFrame, aPresContext, kidDesiredSize, &kidReflowState,
posterTopLeft.x, posterTopLeft.y, 0);
} else if (child->GetContent() == mVideoControls) {
// Reflow the video controls frame.
@ -343,7 +343,7 @@ nsVideoFrame::Reflow(nsPresContext* aPresContext,
ReflowChild(child, aPresContext, kidDesiredSize, kidReflowState,
mBorderPadding.left, mBorderPadding.top, 0, aStatus);
FinishReflowChild(child, aPresContext,
&kidReflowState, kidDesiredSize,
kidDesiredSize, &kidReflowState,
mBorderPadding.left, mBorderPadding.top, 0);
}
}

2
layout/generic/nsViewportFrame.cpp
View File

@ -222,7 +222,7 @@ ViewportFrame::Reflow(nsPresContext* aPresContext,
0, 0, 0, aStatus);
kidHeight = kidDesiredSize.Height();
FinishReflowChild(kidFrame, aPresContext, nullptr, kidDesiredSize, 0, 0, 0);
FinishReflowChild(kidFrame, aPresContext, kidDesiredSize, nullptr, 0, 0, 0);
} else {
kidHeight = mFrames.FirstChild()->GetSize().height;
}

4
layout/mathml/nsMathMLContainerFrame.cpp
View File

@ -1325,8 +1325,8 @@ nsMathMLContainerFrame::PositionRowChildFrames(nscoord aOffsetX,
while (child.Frame()) {
nscoord dx = aOffsetX + child.X();
nscoord dy = aBaseline - child.Ascent();
FinishReflowChild(child.Frame(), PresContext(), nullptr,
child.ReflowMetrics(), dx, dy, 0);
FinishReflowChild(child.Frame(), PresContext(), child.ReflowMetrics(),
nullptr, dx, dy, 0);
++child;
}
}

2
layout/mathml/nsMathMLSelectedFrame.cpp
View File

@ -144,7 +144,7 @@ nsMathMLSelectedFrame::Place(nsRenderingContext& aRenderingContext,
if (childFrame) {
GetReflowAndBoundingMetricsFor(childFrame, aDesiredSize, mBoundingMetrics);
if (aPlaceOrigin) {
FinishReflowChild(childFrame, PresContext(), nullptr, aDesiredSize, 0, 0, 0);
FinishReflowChild(childFrame, PresContext(), aDesiredSize, nullptr, 0, 0, 0);
}
mReference.x = 0;
mReference.y = aDesiredSize.TopAscent();

2
layout/mathml/nsMathMLTokenFrame.cpp
View File

@ -215,7 +215,7 @@ nsMathMLTokenFrame::Place(nsRenderingContext& aRenderingContext,
// place and size the child; (dx,0) makes the caret happy - bug 188146
dy = childSize.Height() == 0 ? 0 : aDesiredSize.TopAscent() - childSize.TopAscent();
FinishReflowChild(childFrame, PresContext(), nullptr, childSize, dx, dy, 0);
FinishReflowChild(childFrame, PresContext(), childSize, nullptr, dx, dy, 0);
dx += childSize.Width();
}
}

2
layout/mathml/nsMathMLmfencedFrame.cpp
View File

@ -368,7 +368,7 @@ nsMathMLmfencedFrame::Reflow(nsPresContext* aPresContext,
else
aDesiredSize.mBoundingMetrics += bm;
FinishReflowChild(childFrame, aPresContext, nullptr, childSize,
FinishReflowChild(childFrame, aPresContext, childSize, nullptr,
dx, ascent - childSize.TopAscent(), 0);
dx += childSize.Width();

8
layout/mathml/nsMathMLmfracFrame.cpp
View File

@ -369,10 +369,10 @@ nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
nscoord dy;
// place numerator
dy = 0;
FinishReflowChild(frameNum, presContext, nullptr, sizeNum, dxNum, dy, 0);
FinishReflowChild(frameNum, presContext, sizeNum, nullptr, dxNum, dy, 0);
// place denominator
dy = aDesiredSize.Height() - sizeDen.Height();
FinishReflowChild(frameDen, presContext, nullptr, sizeDen, dxDen, dy, 0);
FinishReflowChild(frameDen, presContext, sizeDen, nullptr, dxDen, dy, 0);
// place the fraction bar - dy is top of bar
dy = aDesiredSize.TopAscent() - (axisHeight + actualRuleThickness/2);
mLineRect.SetRect(leftSpace, dy, width - (leftSpace + rightSpace),
@ -483,7 +483,7 @@ nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
dx = MirrorIfRTL(aDesiredSize.Width(), sizeNum.Width(),
leadingSpace);
dy = aDesiredSize.TopAscent() - numShift - sizeNum.TopAscent();
FinishReflowChild(frameNum, presContext, nullptr, sizeNum, dx, dy, 0);
FinishReflowChild(frameNum, presContext, sizeNum, nullptr, dx, dy, 0);
// place the fraction bar
dx = MirrorIfRTL(aDesiredSize.Width(), mLineRect.width,
@ -496,7 +496,7 @@ nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
dx = MirrorIfRTL(aDesiredSize.Width(), sizeDen.Width(),
leadingSpace + bmNum.width + mLineRect.width);
dy = aDesiredSize.TopAscent() + denShift - sizeDen.TopAscent();
FinishReflowChild(frameDen, presContext, nullptr, sizeDen, dx, dy, 0);
FinishReflowChild(frameDen, presContext, sizeDen, nullptr, dx, dy, 0);
}
}

10
layout/mathml/nsMathMLmmultiscriptsFrame.cpp
View File

@ -565,7 +565,7 @@ nsMathMLmmultiscriptsFrame::PlaceMultiScript(nsPresContext* aPresContext,
// place the base ...
childFrame = baseFrame;
dy = aDesiredSize.TopAscent() - baseSize.TopAscent();
FinishReflowChild (baseFrame, aPresContext, nullptr, baseSize,
FinishReflowChild (baseFrame, aPresContext, baseSize, nullptr,
aFrame->MirrorIfRTL(aDesiredSize.Width(),
baseSize.Width(),
dx),
@ -598,8 +598,8 @@ nsMathMLmmultiscriptsFrame::PlaceMultiScript(nsPresContext* aPresContext,
x += width - subScriptSize.Width();
dy = aDesiredSize.TopAscent() - subScriptSize.TopAscent() +
maxSubScriptShift;
FinishReflowChild (subScriptFrame, aPresContext, nullptr,
subScriptSize,
FinishReflowChild (subScriptFrame, aPresContext, subScriptSize,
nullptr,
aFrame->MirrorIfRTL(aDesiredSize.Width(),
subScriptSize.Width(),
x),
@ -612,8 +612,8 @@ nsMathMLmmultiscriptsFrame::PlaceMultiScript(nsPresContext* aPresContext,
x += width - supScriptSize.Width();
dy = aDesiredSize.TopAscent() - supScriptSize.TopAscent() -
maxSupScriptShift;
FinishReflowChild (supScriptFrame, aPresContext, nullptr,
supScriptSize,
FinishReflowChild (supScriptFrame, aPresContext, supScriptSize,
nullptr,
aFrame->MirrorIfRTL(aDesiredSize.Width(),
supScriptSize.Width(),
x),

4
layout/mathml/nsMathMLmrootFrame.cpp
View File

@ -327,7 +327,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext* aPresContext,
// place the index
nscoord dx = dxIndex;
nscoord dy = aDesiredSize.TopAscent() - (indexRaisedAscent + indexSize.TopAscent() - bmIndex.ascent);
FinishReflowChild(indexFrame, aPresContext, nullptr, indexSize,
FinishReflowChild(indexFrame, aPresContext, indexSize, nullptr,
MirrorIfRTL(aDesiredSize.Width(), indexSize.Width(), dx),
dy, 0);
@ -342,7 +342,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext* aPresContext,
// place the base
dy = aDesiredSize.TopAscent() - baseSize.TopAscent();
FinishReflowChild(baseFrame, aPresContext, nullptr, baseSize,
FinishReflowChild(baseFrame, aPresContext, baseSize, nullptr,
MirrorIfRTL(aDesiredSize.Width(), baseSize.Width(), dx),
dy, 0);

6
layout/mathml/nsMathMLmunderoverFrame.cpp
View File

@ -607,16 +607,16 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
if (overFrame) {
dy = aDesiredSize.TopAscent() - mBoundingMetrics.ascent + bmOver.ascent
- overSize.TopAscent();
FinishReflowChild (overFrame, PresContext(), nullptr, overSize, dxOver, dy, 0);
FinishReflowChild (overFrame, PresContext(), overSize, nullptr, dxOver, dy, 0);
}
// place base
dy = aDesiredSize.TopAscent() - baseSize.TopAscent();
FinishReflowChild (baseFrame, PresContext(), nullptr, baseSize, dxBase, dy, 0);
FinishReflowChild (baseFrame, PresContext(), baseSize, nullptr, dxBase, dy, 0);
// place underscript
if (underFrame) {
dy = aDesiredSize.TopAscent() + mBoundingMetrics.descent - bmUnder.descent
- underSize.TopAscent();
FinishReflowChild (underFrame, PresContext(), nullptr, underSize,
FinishReflowChild (underFrame, PresContext(), underSize, nullptr,
dxUnder, dy, 0);
}
}

2
layout/svg/nsSVGForeignObjectFrame.cpp
View File

@ -569,7 +569,7 @@ nsSVGForeignObjectFrame::DoReflow()
NS_FRAME_NO_MOVE_FRAME, status);
NS_ASSERTION(mRect.width == desiredSize.Width() &&
mRect.height == desiredSize.Height(), "unexpected size");
FinishReflowChild(kid, presContext, &reflowState, desiredSize, 0, 0,
FinishReflowChild(kid, presContext, desiredSize, &reflowState, 0, 0,
NS_FRAME_NO_MOVE_FRAME);
mInReflow = false;

2
layout/tables/nsTableCellFrame.cpp
View File

@ -948,7 +948,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsPresContext* aPresContext,
SetContentEmpty(isEmpty);
// Place the child
FinishReflowChild(firstKid, aPresContext, &kidReflowState, kidSize,
FinishReflowChild(firstKid, aPresContext, kidSize, &kidReflowState,
kidOrigin.x, kidOrigin.y, 0);
nsTableFrame::InvalidateTableFrame(firstKid, origRect, origVisualOverflow,

2
layout/tables/nsTableColGroupFrame.cpp
View File

@ -377,7 +377,7 @@ NS_METHOD nsTableColGroupFrame::Reflow(nsPresContext* aPresContext,
nsReflowStatus status;
ReflowChild(kidFrame, aPresContext, kidSize, kidReflowState, 0, 0, 0, status);
FinishReflowChild(kidFrame, aPresContext, nullptr, kidSize, 0, 0, 0);
FinishReflowChild(kidFrame, aPresContext, kidSize, nullptr, 0, 0, 0);
}
aDesiredSize.Width() = 0;

4
layout/tables/nsTableFrame.cpp
View File

@ -2538,7 +2538,7 @@ void nsTableFrame::PlaceChild(nsTableReflowState& aReflowState,
(aKidFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW) != 0;
// Place and size the child
FinishReflowChild(aKidFrame, PresContext(), nullptr, aKidDesiredSize,
FinishReflowChild(aKidFrame, PresContext(), aKidDesiredSize, nullptr,
aReflowState.x, aReflowState.y, 0);
InvalidateTableFrame(aKidFrame, aOriginalKidRect, aOriginalKidVisualOverflow,
@ -3020,7 +3020,7 @@ nsTableFrame::ReflowColGroups(nsRenderingContext *aRenderingContext)
nsReflowStatus cgStatus;
ReflowChild(kidFrame, presContext, kidMet, kidReflowState, 0, 0, 0,
cgStatus);
FinishReflowChild(kidFrame, presContext, nullptr, kidMet, 0, 0, 0);
FinishReflowChild(kidFrame, presContext, kidMet, nullptr, 0, 0, 0);
}
}
SetHaveReflowedColGroups(true);

6
layout/tables/nsTableOuterFrame.cpp
View File

@ -1032,8 +1032,8 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext* aPresContext,
nsPoint captionOrigin;
GetCaptionOrigin(captionSide, containSize, innerSize,
innerMargin, captionSize, captionMargin, captionOrigin);
FinishReflowChild(mCaptionFrames.FirstChild(), aPresContext, captionRS,
captionMet, captionOrigin.x, captionOrigin.y, 0);
FinishReflowChild(mCaptionFrames.FirstChild(), aPresContext, captionMet,
captionRS, captionOrigin.x, captionOrigin.y, 0);
captionRS->~nsHTMLReflowState();
}
// XXX If the height is constrained then we need to check whether
@ -1042,7 +1042,7 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext* aPresContext,
nsPoint innerOrigin;
GetInnerOrigin(captionSide, containSize, captionSize,
captionMargin, innerSize, innerMargin, innerOrigin);
FinishReflowChild(InnerTableFrame(), aPresContext, innerRS, innerMet,
FinishReflowChild(InnerTableFrame(), aPresContext, innerMet, innerRS,
innerOrigin.x, innerOrigin.y, 0);
innerRS->~nsHTMLReflowState();

2
layout/tables/nsTableRowFrame.cpp
View File

@ -951,7 +951,7 @@ nsTableRowFrame::ReflowChildren(nsPresContext* aPresContext,
// Place the child
desiredSize.Width() = availCellWidth;
FinishReflowChild(kidFrame, aPresContext, nullptr, desiredSize, x, 0, 0);
FinishReflowChild(kidFrame, aPresContext, desiredSize, nullptr, x, 0, 0);
nsTableFrame::InvalidateTableFrame(kidFrame, kidRect, kidVisualOverflow,
firstReflow);

2
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -270,7 +270,7 @@ nsTableRowGroupFrame::PlaceChild(nsPresContext* aPresContext,
(aKidFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW) != 0;
// Place and size the child
FinishReflowChild(aKidFrame, aPresContext, nullptr, aDesiredSize, 0,
FinishReflowChild(aKidFrame, aPresContext, aDesiredSize, nullptr, 0,
aReflowState.y, 0);
nsTableFrame::InvalidateTableFrame(aKidFrame, aOriginalKidRect,