зеркало из https://github.com/mozilla/gecko-dev.git
don't cause twice a initial reflow on a caption bug 258379 r/sr=bzbarsky
This commit is contained in:
Родитель
c86afdf533
Коммит
02de8104c7
|
@ -2005,10 +2005,14 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext* aPresContext,
|
||||||
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
|
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
|
||||||
ignorePadding, &innerSize.width, &innerMarginNoAuto, &innerMargin);
|
ignorePadding, &innerSize.width, &innerMarginNoAuto, &innerMargin);
|
||||||
nsHTMLReflowMetrics captionMet(PR_FALSE);
|
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
|
nsReflowStatus capStatus; // don't let the caption cause incomplete
|
||||||
rv = OuterReflowChild(aPresContext, mCaptionFrame, aOuterRS, captionMet,
|
rv = OuterReflowChild(aPresContext, mCaptionFrame, aOuterRS, captionMet,
|
||||||
availWidth, captionSize, captionMargin, captionMarginNoAuto,
|
availWidth, captionSize, captionMargin, captionMarginNoAuto,
|
||||||
ignorePadding, aOuterRS.reason, capStatus);
|
ignorePadding, reason, capStatus);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
nsPoint captionOrigin;
|
nsPoint captionOrigin;
|
||||||
|
|
|
@ -2005,10 +2005,14 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext* aPresContext,
|
||||||
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
|
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
|
||||||
ignorePadding, &innerSize.width, &innerMarginNoAuto, &innerMargin);
|
ignorePadding, &innerSize.width, &innerMarginNoAuto, &innerMargin);
|
||||||
nsHTMLReflowMetrics captionMet(PR_FALSE);
|
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
|
nsReflowStatus capStatus; // don't let the caption cause incomplete
|
||||||
rv = OuterReflowChild(aPresContext, mCaptionFrame, aOuterRS, captionMet,
|
rv = OuterReflowChild(aPresContext, mCaptionFrame, aOuterRS, captionMet,
|
||||||
availWidth, captionSize, captionMargin, captionMarginNoAuto,
|
availWidth, captionSize, captionMargin, captionMarginNoAuto,
|
||||||
ignorePadding, aOuterRS.reason, capStatus);
|
ignorePadding, reason, capStatus);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
nsPoint captionOrigin;
|
nsPoint captionOrigin;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче