From a34759dd7e312bedb0e7dd2589a75209e309816f Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Sat, 20 Mar 1999 21:55:37 +0000 Subject: [PATCH] Removed some cruft git-svn-id: svn://10.0.0.236/trunk@24592 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockBandData.cpp | 16 ---------------- mozilla/layout/generic/nsHTMLReflowState.cpp | 12 ------------ mozilla/layout/html/base/src/nsBlockBandData.cpp | 16 ---------------- .../layout/html/base/src/nsHTMLReflowState.cpp | 12 ------------ 4 files changed, 56 deletions(-) diff --git a/mozilla/layout/generic/nsBlockBandData.cpp b/mozilla/layout/generic/nsBlockBandData.cpp index e1d02e13ebc..000c334df7d 100644 --- a/mozilla/layout/generic/nsBlockBandData.cpp +++ b/mozilla/layout/generic/nsBlockBandData.cpp @@ -52,14 +52,6 @@ nsBlockBandData::Init(nsISpaceManager* aSpaceManager, aSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpace = aSpace; -#ifdef DEBUG_kipp - if (mSpace.width != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mSpace.width > -200000) && (mSpace.width < 200000), "oy"); - } - if (mSpace.height != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mSpace.height > -200000) && (mSpace.height < 200000), "oy"); - } -#endif return NS_OK; } @@ -187,14 +179,6 @@ nsBlockBandData::ComputeAvailSpaceRect() if (NS_UNCONSTRAINEDSIZE == mSpace.width) { mAvailSpace.width = NS_UNCONSTRAINEDSIZE; } -#ifdef DEBUG_kipp - if (mAvailSpace.width != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mAvailSpace.width > -200000) && (mAvailSpace.width < 200000), "oy"); - } - if (mAvailSpace.height != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mAvailSpace.height > -200000) && (mAvailSpace.height < 200000), "oy"); - } -#endif } /** diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp index b4c171df568..36ce6e58f55 100644 --- a/mozilla/layout/generic/nsHTMLReflowState.cpp +++ b/mozilla/layout/generic/nsHTMLReflowState.cpp @@ -766,12 +766,6 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext) // XXX fix to provide 0,0 for the top&bottom margins for // inline-non-replaced elements ComputeMargin(containingBlockWidth); -#ifdef DEBUG_kipp - NS_ASSERTION((computedMargin.left > -200000) && - (computedMargin.left < 200000), "oy"); - NS_ASSERTION((computedMargin.right > -200000) && - (computedMargin.right < 200000), "oy"); -#endif ComputePadding(containingBlockWidth); if (!mStyleSpacing->GetBorder(mComputedBorderPadding)) { // CSS2 has no percentage borders @@ -1096,12 +1090,6 @@ nsHTMLReflowState::CalculateLeftRightMargin(const nsHTMLReflowState* cbrs, } else if (isAutoRightMargin) { computedMargin.right = availMarginSpace - computedMargin.left; } -#ifdef DEBUG_kipp - NS_ASSERTION((computedMargin.left > -200000) && - (computedMargin.left < 200000), "oy"); - NS_ASSERTION((computedMargin.right > -200000) && - (computedMargin.right < 200000), "oy"); -#endif } } diff --git a/mozilla/layout/html/base/src/nsBlockBandData.cpp b/mozilla/layout/html/base/src/nsBlockBandData.cpp index e1d02e13ebc..000c334df7d 100644 --- a/mozilla/layout/html/base/src/nsBlockBandData.cpp +++ b/mozilla/layout/html/base/src/nsBlockBandData.cpp @@ -52,14 +52,6 @@ nsBlockBandData::Init(nsISpaceManager* aSpaceManager, aSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpace = aSpace; -#ifdef DEBUG_kipp - if (mSpace.width != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mSpace.width > -200000) && (mSpace.width < 200000), "oy"); - } - if (mSpace.height != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mSpace.height > -200000) && (mSpace.height < 200000), "oy"); - } -#endif return NS_OK; } @@ -187,14 +179,6 @@ nsBlockBandData::ComputeAvailSpaceRect() if (NS_UNCONSTRAINEDSIZE == mSpace.width) { mAvailSpace.width = NS_UNCONSTRAINEDSIZE; } -#ifdef DEBUG_kipp - if (mAvailSpace.width != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mAvailSpace.width > -200000) && (mAvailSpace.width < 200000), "oy"); - } - if (mAvailSpace.height != NS_UNCONSTRAINEDSIZE) { - NS_ASSERTION((mAvailSpace.height > -200000) && (mAvailSpace.height < 200000), "oy"); - } -#endif } /** diff --git a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp index b4c171df568..36ce6e58f55 100644 --- a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp +++ b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp @@ -766,12 +766,6 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext) // XXX fix to provide 0,0 for the top&bottom margins for // inline-non-replaced elements ComputeMargin(containingBlockWidth); -#ifdef DEBUG_kipp - NS_ASSERTION((computedMargin.left > -200000) && - (computedMargin.left < 200000), "oy"); - NS_ASSERTION((computedMargin.right > -200000) && - (computedMargin.right < 200000), "oy"); -#endif ComputePadding(containingBlockWidth); if (!mStyleSpacing->GetBorder(mComputedBorderPadding)) { // CSS2 has no percentage borders @@ -1096,12 +1090,6 @@ nsHTMLReflowState::CalculateLeftRightMargin(const nsHTMLReflowState* cbrs, } else if (isAutoRightMargin) { computedMargin.right = availMarginSpace - computedMargin.left; } -#ifdef DEBUG_kipp - NS_ASSERTION((computedMargin.left > -200000) && - (computedMargin.left < 200000), "oy"); - NS_ASSERTION((computedMargin.right > -200000) && - (computedMargin.right < 200000), "oy"); -#endif } }