bug 122899 encapsulate debug code r=karnaze sr=attinasi a=roc+moz

bug 128229 pass stylechange reflow to table childrens r=karnaze sr=roc+moz a=asa

layout/html/table/src/nsTableFrame.cpp

@@ -1957,7 +1957,8 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext*          aPresContext,
       if (!mPrevInFlow) {
         SetHadInitialReflow(PR_TRUE);
         SetNeedStrategyBalance(PR_TRUE); // force a balance and then a pass2 reflow 
-        nextReason = eReflowReason_Resize;
+        if (nextReason != eReflowReason_StyleChange) 
+          nextReason = eReflowReason_Resize;
       }
       else {
         nextReason = eReflowReason_Initial;
@@ -4371,6 +4372,7 @@ nsTableFrame::GetFrameAtOrBefore(nsIPresContext* aPresContext,
   return (nsTableCellFrame*)lastMatchingFrame;
 }
 
+#ifdef DEBUG
 void 
 nsTableFrame::DumpRowGroup(nsIPresContext* aPresContext, nsIFrame* aKidFrame)
 {
@@ -4449,12 +4451,11 @@ nsTableFrame::Dump(nsIPresContext* aPresContext,
   }
   if (aDumpCellMap) {
     nsTableCellMap* cellMap = GetCellMap();
-#ifdef NS_DEBUG
     cellMap->Dump();
-#endif
   }
   printf(" ***END TABLE DUMP*** \n");
 }
+#endif
 
 // nsTableIterator
 nsTableIterator::nsTableIterator(nsIPresContext*  aPresContext,
@@ -7538,7 +7539,7 @@ nsTableFrame::GetProperty(nsIPresContext*      aPresContext,
         // The property isn't set yet, so allocate a new value, set the property,
         // and return the newly allocated value
         void* value = nsnull;
-        NSFMPropertyDtorFunc dtorFunc;
+        NSFMPropertyDtorFunc dtorFunc = nsnull;
         if (aPropertyName == nsLayoutAtoms::collapseOffsetProperty) {
           value = new nsPoint(0, 0);
           dtorFunc = DestroyPointFunc;

layout/html/table/src/nsTableFrame.h

@@ -901,11 +901,12 @@ public: /* ----- Cell Map public methods ----- */
 
 public:
   static nsIAtom* gColGroupAtom;
+#ifdef DEBUG
   void Dump(nsIPresContext* aPresContext,
             PRBool          aDumpRows,
             PRBool          aDumpCols, 
             PRBool          aDumpCellMap);
-
+#endif
   nsAutoVoidArray mColFrames; // XXX temporarily public 
 
 #ifdef DEBUG
@@ -914,9 +915,9 @@ public:
 #endif
 
 protected:
+#ifdef DEBUG
   void DumpRowGroup(nsIPresContext* aPresContext, nsIFrame* aChildFrame);
-  void DebugPrintCount() const; // Debugging routine
-
+#endif
   // DATA MEMBERS
 
   struct TableBits {

layout/tables/nsTableFrame.cpp

@@ -1957,7 +1957,8 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext*          aPresContext,
       if (!mPrevInFlow) {
         SetHadInitialReflow(PR_TRUE);
         SetNeedStrategyBalance(PR_TRUE); // force a balance and then a pass2 reflow 
-        nextReason = eReflowReason_Resize;
+        if (nextReason != eReflowReason_StyleChange) 
+          nextReason = eReflowReason_Resize;
       }
       else {
         nextReason = eReflowReason_Initial;
@@ -4371,6 +4372,7 @@ nsTableFrame::GetFrameAtOrBefore(nsIPresContext* aPresContext,
   return (nsTableCellFrame*)lastMatchingFrame;
 }
 
+#ifdef DEBUG
 void 
 nsTableFrame::DumpRowGroup(nsIPresContext* aPresContext, nsIFrame* aKidFrame)
 {
@@ -4449,12 +4451,11 @@ nsTableFrame::Dump(nsIPresContext* aPresContext,
   }
   if (aDumpCellMap) {
     nsTableCellMap* cellMap = GetCellMap();
-#ifdef NS_DEBUG
     cellMap->Dump();
-#endif
   }
   printf(" ***END TABLE DUMP*** \n");
 }
+#endif
 
 // nsTableIterator
 nsTableIterator::nsTableIterator(nsIPresContext*  aPresContext,
@@ -7538,7 +7539,7 @@ nsTableFrame::GetProperty(nsIPresContext*      aPresContext,
         // The property isn't set yet, so allocate a new value, set the property,
         // and return the newly allocated value
         void* value = nsnull;
-        NSFMPropertyDtorFunc dtorFunc;
+        NSFMPropertyDtorFunc dtorFunc = nsnull;
         if (aPropertyName == nsLayoutAtoms::collapseOffsetProperty) {
           value = new nsPoint(0, 0);
           dtorFunc = DestroyPointFunc;

layout/tables/nsTableFrame.h

@@ -901,11 +901,12 @@ public: /* ----- Cell Map public methods ----- */
 
 public:
   static nsIAtom* gColGroupAtom;
+#ifdef DEBUG
   void Dump(nsIPresContext* aPresContext,
             PRBool          aDumpRows,
             PRBool          aDumpCols, 
             PRBool          aDumpCellMap);
-
+#endif
   nsAutoVoidArray mColFrames; // XXX temporarily public 
 
 #ifdef DEBUG
@@ -914,9 +915,9 @@ public:
 #endif
 
 protected:
+#ifdef DEBUG
   void DumpRowGroup(nsIPresContext* aPresContext, nsIFrame* aChildFrame);
-  void DebugPrintCount() const; // Debugging routine
-
+#endif
   // DATA MEMBERS
 
   struct TableBits {