diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index c58db576cb94..592d099a5f34 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -247,6 +247,7 @@ nsFieldSetFrame::Reflow(nsIPresContext*          aPresContext,
                         const nsHTMLReflowState& aReflowState,
                         nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsFieldSetFrame", aReflowState.reason);
  
   // Initialize OUT parameter
    aStatus = NS_FRAME_COMPLETE;
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index d2882faf5644..35997c7f05db 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -276,6 +276,8 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsIPresContext*          aPresContext,
                                          const nsHTMLReflowState& aReflowState, 
                                          nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsFileControlFrame", aReflowState.reason);
+
   if (mFormFrame == nsnull && eReflowReason_Initial == aReflowState.reason) {
     // add ourself as an nsIFormControlFrame
     nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp
index eb4564f4d336..f3be7a3e9253 100644
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -520,6 +520,8 @@ nsFormControlFrame::Reflow(nsIPresContext*          aPresContext,
                            const nsHTMLReflowState& aReflowState,
                            nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsFormControlFrame", aReflowState.reason);
+
   if (!mDidInit) {
     mPresContext = aPresContext;
     InitializeControl(aPresContext);
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp
index 8ec1e90e87b0..4b507a4f8d14 100644
--- a/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/layout/forms/nsGfxButtonControlFrame.cpp
@@ -523,6 +523,8 @@ nsGfxButtonControlFrame::Reflow(nsIPresContext*          aPresContext,
                                 const nsHTMLReflowState& aReflowState, 
                                 nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsGfxButtonControlFrame", aReflowState.reason);
+
    // The mFormFrame is set in the initial reflow within nsHTMLButtonControlFrame
   nsresult rv = NS_OK;
   if (eReflowReason_Initial == aReflowState.reason) {
diff --git a/layout/forms/nsGfxCheckboxControlFrame.cpp b/layout/forms/nsGfxCheckboxControlFrame.cpp
index ba60057b8451..1542fd7751c4 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.cpp
+++ b/layout/forms/nsGfxCheckboxControlFrame.cpp
@@ -643,6 +643,7 @@ nsGfxCheckboxControlFrame::Reflow(nsIPresContext*          aPresContext,
                                   const nsHTMLReflowState& aReflowState, 
                                   nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsGfxCheckboxControlFrame", aReflowState.reason);
   nsresult rv = nsFormControlFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
 
   COMPARE_QUIRK_SIZE("nsGfxCheckboxControlFrame", 13, 13) 
diff --git a/layout/forms/nsGfxRadioControlFrame.cpp b/layout/forms/nsGfxRadioControlFrame.cpp
index f121b4d4c4db..9df4909388d0 100644
--- a/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/layout/forms/nsGfxRadioControlFrame.cpp
@@ -385,6 +385,8 @@ nsGfxRadioControlFrame::Reflow(nsIPresContext*          aPresContext,
                                const nsHTMLReflowState& aReflowState, 
                                nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsGfxRadioControlFrame", aReflowState.reason);
+
   nsresult rv = nsNativeFormControlFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
 
   COMPARE_QUIRK_SIZE("nsGfxRadioControlFrame", 12, 11) 
diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp
index 92c737376f0a..4cde44dbdc3a 100644
--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -522,6 +522,8 @@ nsHTMLButtonControlFrame::Reflow(nsIPresContext* aPresContext,
                                const nsHTMLReflowState& aReflowState,
                                nsReflowStatus& aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLButtonControlFrame", aReflowState.reason);
+
   if (!mFormFrame && (eReflowReason_Initial == aReflowState.reason)) {
     mPresContext = aPresContext;
     nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index 521c56beb79f..77423257fe10 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -259,6 +259,7 @@ nsImageControlFrame::Reflow(nsIPresContext*         aPresContext,
                            const nsHTMLReflowState& aReflowState,
                            nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsImageControlFrame", aReflowState.reason);
   if (!mFormFrame && (eReflowReason_Initial == aReflowState.reason)) {
     mPresContext = aPresContext;
     nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
diff --git a/layout/forms/nsLegendFrame.cpp b/layout/forms/nsLegendFrame.cpp
index a65e45f7b3aa..a3ec978ee241 100644
--- a/layout/forms/nsLegendFrame.cpp
+++ b/layout/forms/nsLegendFrame.cpp
@@ -90,6 +90,7 @@ nsLegendFrame::Reflow(nsIPresContext*          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsLegendFrame", aReflowState.reason);
   if (eReflowReason_Initial == aReflowState.reason) {
     mPresContext = aPresContext;
     nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp
index 1fc97f6a0cf3..a260e84b37ef 100644
--- a/layout/generic/nsFrameFrame.cpp
+++ b/layout/generic/nsFrameFrame.cpp
@@ -327,6 +327,7 @@ nsHTMLFrameOuterFrame::Reflow(nsIPresContext*          aPresContext,
                               const nsHTMLReflowState& aReflowState,
                               nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFrameOuterFrame", aReflowState.reason);
   //printf("OuterFrame::Reflow %X (%d,%d) \n", this, aReflowState.availableWidth, aReflowState.availableHeight); 
   NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
      ("enter nsHTMLFrameOuterFrame::Reflow: maxSize=%d,%d reason=%d",
@@ -858,6 +859,7 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext*          aPresContext,
                               const nsHTMLReflowState& aReflowState,
                               nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFrameInnerFrame", aReflowState.reason);
   NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
      ("enter nsHTMLFrameInnerFrame::Reflow: maxSize=%d,%d reason=%d",
       aReflowState.availableWidth,
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
index bd3897a31f2c..d8e1e176db06 100644
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -914,6 +914,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext*          aPresContext,
                             const nsHTMLReflowState& aReflowState,
                             nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFramesetFrame", aReflowState.reason);
   nsCOMPtr<nsIPresShell> shell;
   aPresContext->GetShell(getter_AddRefs(shell));
             
@@ -1573,6 +1574,7 @@ nsHTMLFramesetBorderFrame::Reflow(nsIPresContext*          aPresContext,
                                   const nsHTMLReflowState& aReflowState,
                                   nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFramesetBorderFrame", aReflowState.reason);
   GetDesiredSize(aPresContext, aReflowState, aDesiredSize);
   aStatus = NS_FRAME_COMPLETE;
   return NS_OK;
@@ -1756,6 +1758,7 @@ nsHTMLFramesetBlankFrame::Reflow(nsIPresContext*          aPresContext,
                                  const nsHTMLReflowState& aReflowState,
                                  nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFramesetBlankFrame", aReflowState.reason);
   GetDesiredSize(aPresContext, aReflowState, aDesiredSize);
   aStatus = NS_FRAME_COMPLETE;
   return NS_OK;
diff --git a/layout/html/document/src/nsFrameFrame.cpp b/layout/html/document/src/nsFrameFrame.cpp
index 1fc97f6a0cf3..a260e84b37ef 100644
--- a/layout/html/document/src/nsFrameFrame.cpp
+++ b/layout/html/document/src/nsFrameFrame.cpp
@@ -327,6 +327,7 @@ nsHTMLFrameOuterFrame::Reflow(nsIPresContext*          aPresContext,
                               const nsHTMLReflowState& aReflowState,
                               nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFrameOuterFrame", aReflowState.reason);
   //printf("OuterFrame::Reflow %X (%d,%d) \n", this, aReflowState.availableWidth, aReflowState.availableHeight); 
   NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
      ("enter nsHTMLFrameOuterFrame::Reflow: maxSize=%d,%d reason=%d",
@@ -858,6 +859,7 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext*          aPresContext,
                               const nsHTMLReflowState& aReflowState,
                               nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFrameInnerFrame", aReflowState.reason);
   NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
      ("enter nsHTMLFrameInnerFrame::Reflow: maxSize=%d,%d reason=%d",
       aReflowState.availableWidth,
diff --git a/layout/html/document/src/nsFrameSetFrame.cpp b/layout/html/document/src/nsFrameSetFrame.cpp
index bd3897a31f2c..d8e1e176db06 100644
--- a/layout/html/document/src/nsFrameSetFrame.cpp
+++ b/layout/html/document/src/nsFrameSetFrame.cpp
@@ -914,6 +914,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext*          aPresContext,
                             const nsHTMLReflowState& aReflowState,
                             nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFramesetFrame", aReflowState.reason);
   nsCOMPtr<nsIPresShell> shell;
   aPresContext->GetShell(getter_AddRefs(shell));
             
@@ -1573,6 +1574,7 @@ nsHTMLFramesetBorderFrame::Reflow(nsIPresContext*          aPresContext,
                                   const nsHTMLReflowState& aReflowState,
                                   nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFramesetBorderFrame", aReflowState.reason);
   GetDesiredSize(aPresContext, aReflowState, aDesiredSize);
   aStatus = NS_FRAME_COMPLETE;
   return NS_OK;
@@ -1756,6 +1758,7 @@ nsHTMLFramesetBlankFrame::Reflow(nsIPresContext*          aPresContext,
                                  const nsHTMLReflowState& aReflowState,
                                  nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLFramesetBlankFrame", aReflowState.reason);
   GetDesiredSize(aPresContext, aReflowState, aDesiredSize);
   aStatus = NS_FRAME_COMPLETE;
   return NS_OK;
diff --git a/layout/html/forms/src/nsFieldSetFrame.cpp b/layout/html/forms/src/nsFieldSetFrame.cpp
index c58db576cb94..592d099a5f34 100644
--- a/layout/html/forms/src/nsFieldSetFrame.cpp
+++ b/layout/html/forms/src/nsFieldSetFrame.cpp
@@ -247,6 +247,7 @@ nsFieldSetFrame::Reflow(nsIPresContext*          aPresContext,
                         const nsHTMLReflowState& aReflowState,
                         nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsFieldSetFrame", aReflowState.reason);
  
   // Initialize OUT parameter
    aStatus = NS_FRAME_COMPLETE;
diff --git a/layout/html/forms/src/nsFileControlFrame.cpp b/layout/html/forms/src/nsFileControlFrame.cpp
index d2882faf5644..35997c7f05db 100644
--- a/layout/html/forms/src/nsFileControlFrame.cpp
+++ b/layout/html/forms/src/nsFileControlFrame.cpp
@@ -276,6 +276,8 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsIPresContext*          aPresContext,
                                          const nsHTMLReflowState& aReflowState, 
                                          nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsFileControlFrame", aReflowState.reason);
+
   if (mFormFrame == nsnull && eReflowReason_Initial == aReflowState.reason) {
     // add ourself as an nsIFormControlFrame
     nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
diff --git a/layout/html/forms/src/nsFormControlFrame.cpp b/layout/html/forms/src/nsFormControlFrame.cpp
index eb4564f4d336..f3be7a3e9253 100644
--- a/layout/html/forms/src/nsFormControlFrame.cpp
+++ b/layout/html/forms/src/nsFormControlFrame.cpp
@@ -520,6 +520,8 @@ nsFormControlFrame::Reflow(nsIPresContext*          aPresContext,
                            const nsHTMLReflowState& aReflowState,
                            nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsFormControlFrame", aReflowState.reason);
+
   if (!mDidInit) {
     mPresContext = aPresContext;
     InitializeControl(aPresContext);
diff --git a/layout/html/forms/src/nsGfxButtonControlFrame.cpp b/layout/html/forms/src/nsGfxButtonControlFrame.cpp
index 8ec1e90e87b0..4b507a4f8d14 100644
--- a/layout/html/forms/src/nsGfxButtonControlFrame.cpp
+++ b/layout/html/forms/src/nsGfxButtonControlFrame.cpp
@@ -523,6 +523,8 @@ nsGfxButtonControlFrame::Reflow(nsIPresContext*          aPresContext,
                                 const nsHTMLReflowState& aReflowState, 
                                 nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsGfxButtonControlFrame", aReflowState.reason);
+
    // The mFormFrame is set in the initial reflow within nsHTMLButtonControlFrame
   nsresult rv = NS_OK;
   if (eReflowReason_Initial == aReflowState.reason) {
diff --git a/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp b/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
index ba60057b8451..1542fd7751c4 100644
--- a/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
+++ b/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
@@ -643,6 +643,7 @@ nsGfxCheckboxControlFrame::Reflow(nsIPresContext*          aPresContext,
                                   const nsHTMLReflowState& aReflowState, 
                                   nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsGfxCheckboxControlFrame", aReflowState.reason);
   nsresult rv = nsFormControlFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
 
   COMPARE_QUIRK_SIZE("nsGfxCheckboxControlFrame", 13, 13) 
diff --git a/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/layout/html/forms/src/nsGfxRadioControlFrame.cpp
index f121b4d4c4db..9df4909388d0 100644
--- a/layout/html/forms/src/nsGfxRadioControlFrame.cpp
+++ b/layout/html/forms/src/nsGfxRadioControlFrame.cpp
@@ -385,6 +385,8 @@ nsGfxRadioControlFrame::Reflow(nsIPresContext*          aPresContext,
                                const nsHTMLReflowState& aReflowState, 
                                nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsGfxRadioControlFrame", aReflowState.reason);
+
   nsresult rv = nsNativeFormControlFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
 
   COMPARE_QUIRK_SIZE("nsGfxRadioControlFrame", 12, 11) 
diff --git a/layout/html/forms/src/nsGfxTextControlFrame.cpp b/layout/html/forms/src/nsGfxTextControlFrame.cpp
index f68b7cb683b8..f91c2da50676 100644
--- a/layout/html/forms/src/nsGfxTextControlFrame.cpp
+++ b/layout/html/forms/src/nsGfxTextControlFrame.cpp
@@ -2379,6 +2379,7 @@ nsGfxTextControlFrame::Reflow(nsIPresContext* aPresContext,
                               const nsHTMLReflowState& aReflowState,
                               nsReflowStatus& aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsGfxTextControlFrame", aReflowState.reason);
 #ifdef DEBUG
   mDebugTotalReflows++;
   if (1==mDebugTotalReflows) {  // first reflow, better be initial reflow!
diff --git a/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
index 92c737376f0a..4cde44dbdc3a 100644
--- a/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
+++ b/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
@@ -522,6 +522,8 @@ nsHTMLButtonControlFrame::Reflow(nsIPresContext* aPresContext,
                                const nsHTMLReflowState& aReflowState,
                                nsReflowStatus& aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsHTMLButtonControlFrame", aReflowState.reason);
+
   if (!mFormFrame && (eReflowReason_Initial == aReflowState.reason)) {
     mPresContext = aPresContext;
     nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
diff --git a/layout/html/forms/src/nsImageControlFrame.cpp b/layout/html/forms/src/nsImageControlFrame.cpp
index 521c56beb79f..77423257fe10 100644
--- a/layout/html/forms/src/nsImageControlFrame.cpp
+++ b/layout/html/forms/src/nsImageControlFrame.cpp
@@ -259,6 +259,7 @@ nsImageControlFrame::Reflow(nsIPresContext*         aPresContext,
                            const nsHTMLReflowState& aReflowState,
                            nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsImageControlFrame", aReflowState.reason);
   if (!mFormFrame && (eReflowReason_Initial == aReflowState.reason)) {
     mPresContext = aPresContext;
     nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
diff --git a/layout/html/forms/src/nsLabelFrame.cpp b/layout/html/forms/src/nsLabelFrame.cpp
index 6e237630c78d..9aadd699488d 100644
--- a/layout/html/forms/src/nsLabelFrame.cpp
+++ b/layout/html/forms/src/nsLabelFrame.cpp
@@ -466,7 +466,7 @@ void LabelHack(nsHTMLReflowState& aReflowState, char* aMessage)
 {
   if (aReflowState.mComputedWidth == 0) {
     aReflowState.mComputedWidth = aReflowState.availableWidth;
-    NS_ASSERTION(0, "LabelHack: Path #1");
+    //NS_ASSERTION(0, "LabelHack: Path #1");
   }
   if ((aReflowState.mComputedWidth != NS_INTRINSICSIZE) &&
       (aReflowState.mComputedWidth > aReflowState.availableWidth) &&
@@ -533,6 +533,7 @@ nsLabelFrame::Reflow(nsIPresContext*          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsLabelFrame", aReflowState.reason);
 
   PRBool     isStyleChange      = PR_FALSE;
   PRBool     isDirtyChildReflow = PR_FALSE;
diff --git a/layout/html/forms/src/nsLegendFrame.cpp b/layout/html/forms/src/nsLegendFrame.cpp
index a65e45f7b3aa..a3ec978ee241 100644
--- a/layout/html/forms/src/nsLegendFrame.cpp
+++ b/layout/html/forms/src/nsLegendFrame.cpp
@@ -90,6 +90,7 @@ nsLegendFrame::Reflow(nsIPresContext*          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
+  DO_GLOBAL_REFLOW_COUNT("nsLegendFrame", aReflowState.reason);
   if (eReflowReason_Initial == aReflowState.reason) {
     mPresContext = aPresContext;
     nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);