Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 60494 - only request the max width of the innner table if it is requested of the outer table. sr=buster, r=peterl.

Browse Source
This commit is contained in:
karnaze%netscape.com 2001-01-25 16:00:59 +00:00
parent 7b4e160ba2
commit e105667e95
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/html/table/src/nsTableOuterFrame.cpp
View File

@ -1187,7 +1187,7 @@ nsresult nsTableOuterFrame::IR_TargetIsMe(nsIPresContext* aPresContext
nsresult
nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
nsHTMLReflowMetrics& aOuterMet,
const nsHTMLReflowState& aOuterRS,
nsReflowStatus& aStatus)
{
@ -1201,10 +1201,11 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
nsMargin innerMargin, innerMarginNoAuto, innerPadding;
// pass along the reflow command to the inner table
nsHTMLReflowMetrics innerMet(aDesiredSize.maxElementSize);
nsHTMLReflowMetrics innerMet(aOuterMet.maxElementSize);
// Always request the maximum width if we are an auto layout table XXX why?
if (((nsTableFrame*)mInnerTableFrame)->IsAutoLayout()) {
// request the maximum of the inner table if requested of the outer
if ((aOuterMet.mFlags & NS_REFLOW_CALC_MAX_WIDTH) &&
((nsTableFrame*)mInnerTableFrame)->IsAutoLayout()) {
innerMet.mFlags |= NS_REFLOW_CALC_MAX_WIDTH;
}
nsresult rv = OuterReflowChild(aPresContext, mInnerTableFrame, aOuterRS, innerMet,
@ -1276,9 +1277,9 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
FinishReflowChild(mInnerTableFrame, aPresContext, innerMet,
innerOrigin.x, innerOrigin.y, 0);
UpdateReflowMetrics(captionSide, aDesiredSize, innerMargin, innerMarginNoAuto,
UpdateReflowMetrics(captionSide, aOuterMet, innerMargin, innerMarginNoAuto,
innerPadding, captionMargin, captionMarginNoAuto);
nsSize desSize(aDesiredSize.width, aDesiredSize.height);
nsSize desSize(aOuterMet.width, aOuterMet.height);
InvalidateDamage(aPresContext, captionSide, desSize, PR_FALSE, captionMoved);
return rv;

13
layout/tables/nsTableOuterFrame.cpp
View File

@ -1187,7 +1187,7 @@ nsresult nsTableOuterFrame::IR_TargetIsMe(nsIPresContext* aPresContext
nsresult
nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
nsHTMLReflowMetrics& aOuterMet,
const nsHTMLReflowState& aOuterRS,
nsReflowStatus& aStatus)
{
@ -1201,10 +1201,11 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
nsMargin innerMargin, innerMarginNoAuto, innerPadding;
// pass along the reflow command to the inner table
nsHTMLReflowMetrics innerMet(aDesiredSize.maxElementSize);
nsHTMLReflowMetrics innerMet(aOuterMet.maxElementSize);
// Always request the maximum width if we are an auto layout table XXX why?
if (((nsTableFrame*)mInnerTableFrame)->IsAutoLayout()) {
// request the maximum of the inner table if requested of the outer
if ((aOuterMet.mFlags & NS_REFLOW_CALC_MAX_WIDTH) &&
((nsTableFrame*)mInnerTableFrame)->IsAutoLayout()) {
innerMet.mFlags |= NS_REFLOW_CALC_MAX_WIDTH;
}
nsresult rv = OuterReflowChild(aPresContext, mInnerTableFrame, aOuterRS, innerMet,
@ -1276,9 +1277,9 @@ nsTableOuterFrame::IR_InnerTableReflow(nsIPresContext* aPresContext,
FinishReflowChild(mInnerTableFrame, aPresContext, innerMet,
innerOrigin.x, innerOrigin.y, 0);
UpdateReflowMetrics(captionSide, aDesiredSize, innerMargin, innerMarginNoAuto,
UpdateReflowMetrics(captionSide, aOuterMet, innerMargin, innerMarginNoAuto,
innerPadding, captionMargin, captionMarginNoAuto);
nsSize desSize(aDesiredSize.width, aDesiredSize.height);
nsSize desSize(aOuterMet.width, aOuterMet.height);
InvalidateDamage(aPresContext, captionSide, desSize, PR_FALSE, captionMoved);
return rv;