Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make style-change reflows on the table correctly reflow the caption. Bug

Browse Source 
222864, r=bernd, sr=dbaron


git-svn-id: svn://10.0.0.236/trunk@148192 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2003-10-21 04:30:10 +00:00
parent e07ad3ff86
commit aca03413bf
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/layout/html/table/src/nsTableOuterFrame.cpp
View File

@ -1667,7 +1667,8 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
// If the incremental reflow command is a StyleChanged reflow and
// it's target is the current frame, then make sure we send
// StyleChange reflow reasons down to the children so that they
// don't over-optimize their reflow.
// don't over-optimize their reflow. Also make sure we reflow the caption.
PRBool reflowCaption = PR_FALSE;
nsReflowReason reflowReason = eReflowReason_Incremental;
nsHTMLReflowCommand* command = aOuterRS.path->mReflowCommand;
if (command) {
@ -1675,6 +1676,7 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
command->GetType(type);
if (eReflowType_StyleChanged == type) {
reflowReason = eReflowReason_StyleChange;
reflowCaption = PR_TRUE;
}
}
nscoord capMin = mMinCaptionWidth;
@ -1698,9 +1700,11 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
nsPoint captionOrigin;
nsRect prevCaptionRect = mCaptionFrame->GetRect();
if (priorInnerSize.width != innerMet.width) {
reflowCaption = reflowCaption ||
priorInnerSize.width != innerMet.width;
if (reflowCaption) {
nsMargin ignorePadding;
// XXX only need to reflow if the caption is auto width
nsHTMLReflowMetrics captionMet(eReflowReason_StyleChange == reflowReason);
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
ignorePadding, &innerSize.width, &innerMarginNoAuto);

10
mozilla/layout/tables/nsTableOuterFrame.cpp
View File

@ -1667,7 +1667,8 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
// If the incremental reflow command is a StyleChanged reflow and
// it's target is the current frame, then make sure we send
// StyleChange reflow reasons down to the children so that they
// don't over-optimize their reflow.
// don't over-optimize their reflow. Also make sure we reflow the caption.
PRBool reflowCaption = PR_FALSE;
nsReflowReason reflowReason = eReflowReason_Incremental;
nsHTMLReflowCommand* command = aOuterRS.path->mReflowCommand;
if (command) {
@ -1675,6 +1676,7 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
command->GetType(type);
if (eReflowType_StyleChanged == type) {
reflowReason = eReflowReason_StyleChange;
reflowCaption = PR_TRUE;
}
}
nscoord capMin = mMinCaptionWidth;
@ -1698,9 +1700,11 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
nsPoint captionOrigin;
nsRect prevCaptionRect = mCaptionFrame->GetRect();
if (priorInnerSize.width != innerMet.width) {
reflowCaption = reflowCaption ||
priorInnerSize.width != innerMet.width;
if (reflowCaption) {
nsMargin ignorePadding;
// XXX only need to reflow if the caption is auto width
nsHTMLReflowMetrics captionMet(eReflowReason_StyleChange == reflowReason);
nscoord availWidth = GetCaptionAvailWidth(aPresContext, mCaptionFrame, aOuterRS, captionMargin,
ignorePadding, &innerSize.width, &innerMarginNoAuto);