fix #ifdefs to quiet output (speeds up display of complex tables like tinderbox and slashdot.org) - does not affect release builds

layout/generic/nsBlockFrame.cpp

@@ -2297,7 +2297,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
     aMetrics.mCarriedOutBottomMargin =
       aState.GetFlag(BRS_ISBOTTOMMARGINROOT) ? 0 : aState.mPrevBottomMargin;
 
-#ifdef DEBUG
+#ifdef DEBUG_blocks
     if (CRAZY_WIDTH(aMetrics.width) || CRAZY_HEIGHT(aMetrics.height)) {
       ListTag(stdout);
       printf(": WARNING: desired:%d,%d\n", aMetrics.width, aMetrics.height);

layout/generic/nsBlockReflowState.cpp

@@ -2297,7 +2297,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
     aMetrics.mCarriedOutBottomMargin =
       aState.GetFlag(BRS_ISBOTTOMMARGINROOT) ? 0 : aState.mPrevBottomMargin;
 
-#ifdef DEBUG
+#ifdef DEBUG_blocks
     if (CRAZY_WIDTH(aMetrics.width) || CRAZY_HEIGHT(aMetrics.height)) {
       ListTag(stdout);
       printf(": WARNING: desired:%d,%d\n", aMetrics.width, aMetrics.height);

layout/generic/nsBlockReflowState.h

@@ -2297,7 +2297,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
     aMetrics.mCarriedOutBottomMargin =
       aState.GetFlag(BRS_ISBOTTOMMARGINROOT) ? 0 : aState.mPrevBottomMargin;
 
-#ifdef DEBUG
+#ifdef DEBUG_blocks
     if (CRAZY_WIDTH(aMetrics.width) || CRAZY_HEIGHT(aMetrics.height)) {
       ListTag(stdout);
       printf(": WARNING: desired:%d,%d\n", aMetrics.width, aMetrics.height);

layout/html/base/src/nsBlockFrame.cpp

@@ -2297,7 +2297,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
     aMetrics.mCarriedOutBottomMargin =
       aState.GetFlag(BRS_ISBOTTOMMARGINROOT) ? 0 : aState.mPrevBottomMargin;
 
-#ifdef DEBUG
+#ifdef DEBUG_blocks
     if (CRAZY_WIDTH(aMetrics.width) || CRAZY_HEIGHT(aMetrics.height)) {
       ListTag(stdout);
       printf(": WARNING: desired:%d,%d\n", aMetrics.width, aMetrics.height);

layout/html/base/src/nsBlockReflowState.cpp

@@ -2297,7 +2297,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
     aMetrics.mCarriedOutBottomMargin =
       aState.GetFlag(BRS_ISBOTTOMMARGINROOT) ? 0 : aState.mPrevBottomMargin;
 
-#ifdef DEBUG
+#ifdef DEBUG_blocks
     if (CRAZY_WIDTH(aMetrics.width) || CRAZY_HEIGHT(aMetrics.height)) {
       ListTag(stdout);
       printf(": WARNING: desired:%d,%d\n", aMetrics.width, aMetrics.height);

layout/html/base/src/nsBlockReflowState.h

@@ -2297,7 +2297,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
     aMetrics.mCarriedOutBottomMargin =
       aState.GetFlag(BRS_ISBOTTOMMARGINROOT) ? 0 : aState.mPrevBottomMargin;
 
-#ifdef DEBUG
+#ifdef DEBUG_blocks
     if (CRAZY_WIDTH(aMetrics.width) || CRAZY_HEIGHT(aMetrics.height)) {
       ListTag(stdout);
       printf(": WARNING: desired:%d,%d\n", aMetrics.width, aMetrics.height);

layout/html/table/src/nsTableRowFrame.cpp

@@ -894,7 +894,7 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext*      aPresContext,
           nsReflowStatus status;
           rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState,
                            aReflowState.x, 0, 0, status);
-#ifdef NS_DEBUG
+#ifdef NS_DEBUG_karnaze
           if (desiredSize.width > availWidth)
           {
             printf("WARNING: cell returned desired width %d given avail width %d\n",
@@ -1044,13 +1044,17 @@ nsTableRowFrame::InitialReflow(nsIPresContext*      aPresContext,
 
       // the following signals bugs in the content frames.  
       if (kidMaxElementSize.width > kidSize.width) {
+#ifdef DEBUG_karnaze
         printf("WARNING - table cell content max element width %d greater than desired width %d\n",
           kidMaxElementSize.width, kidSize.width);
+#endif
         kidSize.width = kidMaxElementSize.width;
       }
       if (kidMaxElementSize.height > kidSize.height) {
+#ifdef DEBUG_karnaze
         printf("Warning - table cell content max element height %d greater than desired height %d\n",
           kidMaxElementSize.height, kidSize.height);
+#endif
         kidSize.height = kidMaxElementSize.height;
       }
 

layout/tables/nsTableRowFrame.cpp

@@ -894,7 +894,7 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext*      aPresContext,
           nsReflowStatus status;
           rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState,
                            aReflowState.x, 0, 0, status);
-#ifdef NS_DEBUG
+#ifdef NS_DEBUG_karnaze
           if (desiredSize.width > availWidth)
           {
             printf("WARNING: cell returned desired width %d given avail width %d\n",
@@ -1044,13 +1044,17 @@ nsTableRowFrame::InitialReflow(nsIPresContext*      aPresContext,
 
       // the following signals bugs in the content frames.  
       if (kidMaxElementSize.width > kidSize.width) {
+#ifdef DEBUG_karnaze
         printf("WARNING - table cell content max element width %d greater than desired width %d\n",
           kidMaxElementSize.width, kidSize.width);
+#endif
         kidSize.width = kidMaxElementSize.width;
       }
       if (kidMaxElementSize.height > kidSize.height) {
+#ifdef DEBUG_karnaze
         printf("Warning - table cell content max element height %d greater than desired height %d\n",
           kidMaxElementSize.height, kidSize.height);
+#endif
         kidSize.height = kidMaxElementSize.height;
       }