From 027a9b2cb0e8d17999ac8f7764de32c15afae593 Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Thu, 15 Jun 2000 23:39:49 +0000 Subject: [PATCH] bug 42726 - back out previous checkin. --- layout/html/table/src/nsTableRowFrame.cpp | 15 +++++---------- layout/tables/nsTableRowFrame.cpp | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/layout/html/table/src/nsTableRowFrame.cpp b/layout/html/table/src/nsTableRowFrame.cpp index 648ce95adca..83817a8921b 100644 --- a/layout/html/table/src/nsTableRowFrame.cpp +++ b/layout/html/table/src/nsTableRowFrame.cpp @@ -1437,18 +1437,13 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext* aPresContext, PRBool tallestCellGotShorter = PR_FALSE; #ifndef MOZ_MATHML if (initCellDesSize.height < oldCellDesSize.height) { - if (oldCellDesSize.height == GetTallestCell()) { + nscoord width = initCellDesSize.width; + nscoord height = initCellDesSize.height; + CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style + nscoord tallest = GetTallestCell(); + if ((height == tallest) && (cellMet.height < tallest)) { tallestCellGotShorter = PR_TRUE; } - else { - nscoord width = initCellDesSize.width; - nscoord height = initCellDesSize.height; - CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style - nscoord tallest = GetTallestCell(); - if ((height == tallest) && (cellMet.height < tallest)) { - tallestCellGotShorter = PR_TRUE; - } - } } if (tallestCellGotShorter) { CalcTallestCell(); diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp index 648ce95adca..83817a8921b 100644 --- a/layout/tables/nsTableRowFrame.cpp +++ b/layout/tables/nsTableRowFrame.cpp @@ -1437,18 +1437,13 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext* aPresContext, PRBool tallestCellGotShorter = PR_FALSE; #ifndef MOZ_MATHML if (initCellDesSize.height < oldCellDesSize.height) { - if (oldCellDesSize.height == GetTallestCell()) { + nscoord width = initCellDesSize.width; + nscoord height = initCellDesSize.height; + CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style + nscoord tallest = GetTallestCell(); + if ((height == tallest) && (cellMet.height < tallest)) { tallestCellGotShorter = PR_TRUE; } - else { - nscoord width = initCellDesSize.width; - nscoord height = initCellDesSize.height; - CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style - nscoord tallest = GetTallestCell(); - if ((height == tallest) && (cellMet.height < tallest)) { - tallestCellGotShorter = PR_TRUE; - } - } } if (tallestCellGotShorter) { CalcTallestCell();