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); }