don't cause twice a initial reflow on a caption bug 258379 r/sr=bzbarsky

This commit is contained in:
bmlk%gmx.de 2004-09-11 06:08:53 +00:00
Родитель c86afdf533
Коммит 02de8104c7
2 изменённых файлов: 10 добавлений и 2 удалений

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

@ -2005,10 +2005,14 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext* aPresContext,
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
ignorePadding, &innerSize.width, &innerMarginNoAuto, &innerMargin);
nsHTMLReflowMetrics captionMet(PR_FALSE);
nsReflowReason reason = aOuterRS.reason;
if (eReflowReason_Initial == aOuterRS.reason) {
reason = eReflowReason_Resize; // we have already done the initial reflow
}
nsReflowStatus capStatus; // don't let the caption cause incomplete
rv = OuterReflowChild(aPresContext, mCaptionFrame, aOuterRS, captionMet,
availWidth, captionSize, captionMargin, captionMarginNoAuto,
ignorePadding, aOuterRS.reason, capStatus);
ignorePadding, reason, capStatus);
if (NS_FAILED(rv)) return rv;
nsPoint captionOrigin;

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

@ -2005,10 +2005,14 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext* aPresContext,
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
ignorePadding, &innerSize.width, &innerMarginNoAuto, &innerMargin);
nsHTMLReflowMetrics captionMet(PR_FALSE);
nsReflowReason reason = aOuterRS.reason;
if (eReflowReason_Initial == aOuterRS.reason) {
reason = eReflowReason_Resize; // we have already done the initial reflow
}
nsReflowStatus capStatus; // don't let the caption cause incomplete
rv = OuterReflowChild(aPresContext, mCaptionFrame, aOuterRS, captionMet,
availWidth, captionSize, captionMargin, captionMarginNoAuto,
ignorePadding, aOuterRS.reason, capStatus);
ignorePadding, reason, capStatus);
if (NS_FAILED(rv)) return rv;
nsPoint captionOrigin;