From effb882b96f6e6ac2e1eddecd4e7f369b993a5a2 Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Tue, 14 Mar 2000 14:42:25 +0000 Subject: [PATCH] PDT+ bug 30559 - incorrect inclusion of table margin when placing row group. r=buster, a=rickg. git-svn-id: svn://10.0.0.236/trunk@62934 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/nsTableFrame.cpp | 10 +++++----- mozilla/layout/tables/nsTableFrame.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 0365b142c36..c61c1f4ca61 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -2455,12 +2455,12 @@ NS_METHOD nsTableFrame::IncrementalReflow(nsIPresContext* aPresContext, } reflowState.availableWidth = pass1Width; - // get margin + border + padding - nsMargin borderMarginPadding; - GetTableBorder (borderMarginPadding); - borderMarginPadding += aReflowState.mComputedMargin + aReflowState.mComputedPadding; + // get border + padding + nsMargin borderPadding; + GetTableBorder (borderPadding); + borderPadding += aReflowState.mComputedPadding; - InnerTableReflowState state(aPresContext, reflowState, borderMarginPadding); + InnerTableReflowState state(aPresContext, reflowState, borderPadding); // determine if this frame is the target or not nsIFrame *target=nsnull; diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 0365b142c36..c61c1f4ca61 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -2455,12 +2455,12 @@ NS_METHOD nsTableFrame::IncrementalReflow(nsIPresContext* aPresContext, } reflowState.availableWidth = pass1Width; - // get margin + border + padding - nsMargin borderMarginPadding; - GetTableBorder (borderMarginPadding); - borderMarginPadding += aReflowState.mComputedMargin + aReflowState.mComputedPadding; + // get border + padding + nsMargin borderPadding; + GetTableBorder (borderPadding); + borderPadding += aReflowState.mComputedPadding; - InnerTableReflowState state(aPresContext, reflowState, borderMarginPadding); + InnerTableReflowState state(aPresContext, reflowState, borderPadding); // determine if this frame is the target or not nsIFrame *target=nsnull;