From ad0685af07428ed421c4a78d803002b1aabb9dd5 Mon Sep 17 00:00:00 2001 From: "ftang%netscape.com" Date: Fri, 18 May 2001 20:33:08 +0000 Subject: [PATCH] fix 79653. check in for simon@softel.co.il r=ftang sr=attanasi remove unnecessary code in IBMBIDI due to previous check in git-svn-id: svn://10.0.0.236/trunk@95406 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsHTMLReflowState.cpp | 12 ------------ mozilla/layout/html/base/src/nsHTMLReflowState.cpp | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp index d0d789780d6..38d61a82bca 100644 --- a/mozilla/layout/generic/nsHTMLReflowState.cpp +++ b/mozilla/layout/generic/nsHTMLReflowState.cpp @@ -1851,18 +1851,6 @@ nsHTMLReflowState::ComputeBlockBoxData(nsIPresContext* aPresContext, AdjustComputedWidth(); -#ifdef IBMBIDI - // See what edge the width applies to (the default is the content - // edge) - if (mComputedWidth != NS_UNCONSTRAINEDSIZE) { - if (mStylePosition->mBoxSizing == NS_STYLE_BOX_SIZING_PADDING) { - mComputedWidth -= mComputedPadding.left + mComputedPadding.right; - } else if (mStylePosition->mBoxSizing == NS_STYLE_BOX_SIZING_BORDER) { - mComputedWidth -= mComputedBorderPadding.left + mComputedBorderPadding.right; - } - } -#endif // IBMBIDI - // Now that we have the computed-width, compute the side margins CalculateBlockSideMargins(cbrs->mComputedWidth, mComputedWidth); } diff --git a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp index d0d789780d6..38d61a82bca 100644 --- a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp +++ b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp @@ -1851,18 +1851,6 @@ nsHTMLReflowState::ComputeBlockBoxData(nsIPresContext* aPresContext, AdjustComputedWidth(); -#ifdef IBMBIDI - // See what edge the width applies to (the default is the content - // edge) - if (mComputedWidth != NS_UNCONSTRAINEDSIZE) { - if (mStylePosition->mBoxSizing == NS_STYLE_BOX_SIZING_PADDING) { - mComputedWidth -= mComputedPadding.left + mComputedPadding.right; - } else if (mStylePosition->mBoxSizing == NS_STYLE_BOX_SIZING_BORDER) { - mComputedWidth -= mComputedBorderPadding.left + mComputedBorderPadding.right; - } - } -#endif // IBMBIDI - // Now that we have the computed-width, compute the side margins CalculateBlockSideMargins(cbrs->mComputedWidth, mComputedWidth); }