From 95e05d4062a17a3752fd2ea3cc40cd7ddb95cde1 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Thu, 27 Jan 2000 05:54:17 +0000 Subject: [PATCH] r=karnaze@netscape.com Removed some code that was removed but then added again by mistake git-svn-id: svn://10.0.0.236/trunk@58891 18797224-902f-48f8-a5cc-f745e15eee43 --- .../layout/html/table/src/nsTableRowFrame.cpp | 18 ------------------ mozilla/layout/tables/nsTableRowFrame.cpp | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index ff571516520..c3c210af812 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -1259,24 +1259,6 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext* aPresContext, if (oldMaximumWidth != desiredSize.mMaximumWidth) { aReflowState.tableFrame->InvalidateMaximumWidth(); } - - // Now that we know the minimum and preferred widths see if the column - // widths need to be rebalanced - if (aReflowState.tableFrame->ColumnsAreValidFor(*(nsTableCellFrame*)aNextFrame, - oldMinSize.width, - oldMaximumWidth)) { - // The column widths don't need to be rebalanced. Now reflow the cell - // again this time constraining the width back to the column width again - kidReflowState.reason = eReflowReason_Resize; - kidReflowState.availableWidth = cellAvailWidth; - rv = ReflowChild(aNextFrame, aPresContext, desiredSize, kidReflowState, - aReflowState.x, GetChildMaxTopMargin(), 0, aStatus); - - } else { - // The column widths need to be rebalanced, so don't waste time reflowing - // the cell again. Tell the table to rebalance the column widths - aReflowState.tableFrame->InvalidateColumnWidths(); - } } // Now that we know the minimum and preferred widths see if the column diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index ff571516520..c3c210af812 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -1259,24 +1259,6 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext* aPresContext, if (oldMaximumWidth != desiredSize.mMaximumWidth) { aReflowState.tableFrame->InvalidateMaximumWidth(); } - - // Now that we know the minimum and preferred widths see if the column - // widths need to be rebalanced - if (aReflowState.tableFrame->ColumnsAreValidFor(*(nsTableCellFrame*)aNextFrame, - oldMinSize.width, - oldMaximumWidth)) { - // The column widths don't need to be rebalanced. Now reflow the cell - // again this time constraining the width back to the column width again - kidReflowState.reason = eReflowReason_Resize; - kidReflowState.availableWidth = cellAvailWidth; - rv = ReflowChild(aNextFrame, aPresContext, desiredSize, kidReflowState, - aReflowState.x, GetChildMaxTopMargin(), 0, aStatus); - - } else { - // The column widths need to be rebalanced, so don't waste time reflowing - // the cell again. Tell the table to rebalance the column widths - aReflowState.tableFrame->InvalidateColumnWidths(); - } } // Now that we know the minimum and preferred widths see if the column