Bug 1690901 Part 3 - Rename OuterDoReflowChild() to ReflowChild() for nsTableWrapperFrame. r=layout-reviewers,mats

Differential Revision: https://phabricator.services.mozilla.com/D104107
This commit is contained in:
Ting-Yu Lin 2021-02-05 04:46:44 +00:00
Родитель 3f737fcc31
Коммит 400614dec3
2 изменённых файлов: 13 добавлений и 14 удалений

Просмотреть файл

@ -643,11 +643,11 @@ void nsTableWrapperFrame::CreateReflowInputForCaption(
}
}
void nsTableWrapperFrame::OuterDoReflowChild(nsPresContext* aPresContext,
nsIFrame* aChildFrame,
const ReflowInput& aChildRI,
ReflowOutput& aMetrics,
nsReflowStatus& aStatus) {
void nsTableWrapperFrame::ReflowChild(nsPresContext* aPresContext,
nsIFrame* aChildFrame,
const ReflowInput& aChildRI,
ReflowOutput& aMetrics,
nsReflowStatus& aStatus) {
// Using zero as containerSize here because we want consistency between
// the GetLogicalPosition and ReflowChild calls, to avoid unnecessarily
// changing the frame's coordinates; but we don't yet know its final
@ -668,8 +668,8 @@ void nsTableWrapperFrame::OuterDoReflowChild(nsPresContext* aPresContext,
flags |= ReflowChildFlags::NoDeleteNextInFlowChild;
}
ReflowChild(aChildFrame, aPresContext, aMetrics, aChildRI, wm, childPt,
zeroCSize, flags, aStatus);
nsContainerFrame::ReflowChild(aChildFrame, aPresContext, aMetrics, aChildRI,
wm, childPt, zeroCSize, flags, aStatus);
}
void nsTableWrapperFrame::UpdateOverflowAreas(ReflowOutput& aMet) {
@ -777,8 +777,8 @@ void nsTableWrapperFrame::Reflow(nsPresContext* aPresContext,
// We intentionally don't merge capStatus into aStatus, since we currently
// can't handle caption continuations, but we probably should.
nsReflowStatus capStatus;
OuterDoReflowChild(aPresContext, mCaptionFrames.FirstChild(), *captionRI,
*captionMet, capStatus);
ReflowChild(aPresContext, mCaptionFrames.FirstChild(), *captionRI,
*captionMet, capStatus);
captionSize.ISize(wm) = captionMet->ISize(wm);
captionSize.BSize(wm) = captionMet->BSize(wm);
captionMargin = captionRI->ComputedLogicalMargin(wm);
@ -824,8 +824,7 @@ void nsTableWrapperFrame::Reflow(nsPresContext* aPresContext,
// Then, now that we know how much to reduce the isize of the inner
// table to account for side captions, reflow the inner table.
ReflowOutput innerMet(innerRI->GetWritingMode());
OuterDoReflowChild(aPresContext, InnerTableFrame(), *innerRI, innerMet,
aStatus);
ReflowChild(aPresContext, InnerTableFrame(), *innerRI, innerMet, aStatus);
LogicalSize innerSize(wm, innerMet.ISize(wm), innerMet.BSize(wm));
LogicalSize containSize(wm, GetContainingBlockSize(aOuterRI));

Просмотреть файл

@ -240,9 +240,9 @@ class nsTableWrapperFrame : public nsContainerFrame {
const nscoord aAvailISize) const;
// Reflow the child (caption or inner table frame).
void OuterDoReflowChild(nsPresContext* aPresContext, nsIFrame* aChildFrame,
const ReflowInput& aChildRI, ReflowOutput& aMetrics,
nsReflowStatus& aStatus);
void ReflowChild(nsPresContext* aPresContext, nsIFrame* aChildFrame,
const ReflowInput& aChildRI, ReflowOutput& aMetrics,
nsReflowStatus& aStatus);
// Set the overflow areas in our reflow metrics
void UpdateOverflowAreas(ReflowOutput& aMet);