fixed 3 dumb bugs I introduced recently.

1. cellmap couldn't properly delete CellData because definition was unavailable
2. optimized table cells made taller wouldn't shrink when they should because we were not
remembering the previous desired height of the cell.
3. rows were placing cells on the left edge, and not adding in the left margin.

layout/html/table/src/nsCellMap.cpp

@@ -17,8 +17,7 @@
  */
 #include "nsCRT.h"
 #include "nsCellMap.h"
-#include "nsTablePart.h"
+#include "nsTableFrame.h"
-#include <stdio.h>/* XXX */ // for printf
 
 #ifdef NS_DEBUG
 static PRBool gsDebug1 = PR_FALSE;

layout/html/table/src/nsTableCellFrame.cpp

@@ -60,6 +60,8 @@ nsTableCellFrame::nsTableCellFrame(nsIContent* aContent,
   mColSpan=1;
   mColIndex=0;
   mPriorAvailWidth=0;
+  mPriorDesiredSize.width=0;
+  mPriorDesiredSize.height=0;
 }
 
 nsTableCellFrame::~nsTableCellFrame()
@@ -289,6 +291,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
   mFirstChild->WillReflow(*aPresContext);
   mFirstChild->MoveTo(leftInset, topInset);
   aStatus = ReflowChild(mFirstChild, aPresContext, kidSize, kidReflowState);
+  SetPriorDesiredSize(kidSize);
 
   if (PR_TRUE==gsDebug || PR_TRUE==gsDebugNT)
   {

layout/html/table/src/nsTableCellFrame.h

@@ -84,6 +84,10 @@ public:
   
   virtual void SetPriorAvailWidth(nscoord aPriorAvailWidth);
 
+  virtual nsSize GetPriorDesiredSize();
+
+  virtual void SetPriorDesiredSize(const nsReflowMetrics & aDesiredSize);
+
   virtual ~nsTableCellFrame();
 
   // Get the TableFrame that contains this cell frame
@@ -128,6 +132,8 @@ protected:
   /** the available width we were given in our previous reflow */
   nscoord      mPriorAvailWidth;
 
+  nsSize       mPriorDesiredSize;
+
   nsCellLayoutData *mCellLayoutData;
 
 };
@@ -169,4 +175,13 @@ inline nscoord nsTableCellFrame::GetPriorAvailWidth()
 inline void nsTableCellFrame::SetPriorAvailWidth(nscoord aPriorAvailWidth)
 { mPriorAvailWidth = aPriorAvailWidth;}
 
+inline nsSize nsTableCellFrame::GetPriorDesiredSize()
+{ return mPriorDesiredSize; }
+
+inline void nsTableCellFrame::SetPriorDesiredSize(const nsReflowMetrics & aDesiredSize)
+{ 
+  mPriorDesiredSize.width = aDesiredSize.width;
+  mPriorDesiredSize.height = aDesiredSize.height;
+}
+
 #endif

layout/html/table/src/nsTableRowFrame.cpp

@@ -410,7 +410,7 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext,
 
     // Compute the x-origin for the child, taking into account straddlers (cells from prior
     // rows with rowspans > 1)
-    nscoord x = 0;
+    nscoord x = kidMargin.left;
     PRInt32 cellColIndex = ((nsTableCellFrame *)kidFrame)->GetColIndex();
     for (PRInt32 colIndex=0; colIndex<cellColIndex; colIndex++)
     {
@@ -452,10 +452,9 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext,
     }
     else
     {
-      nsRect cellRect;
+      nsSize priorSize = ((nsTableCellFrame *)kidFrame)->GetPriorDesiredSize();
-      kidFrame->GetRect(cellRect);
+      desiredSize.width = priorSize.width;
-      desiredSize.width = cellRect.width;
+      desiredSize.height = priorSize.height;
-      desiredSize.height = cellRect.height;
       status = NS_FRAME_COMPLETE; // XXX: in paginated world, this doesn't work!
     }
 

layout/tables/nsCellMap.cpp

@@ -17,8 +17,7 @@
  */
 #include "nsCRT.h"
 #include "nsCellMap.h"
-#include "nsTablePart.h"
+#include "nsTableFrame.h"
-#include <stdio.h>/* XXX */ // for printf
 
 #ifdef NS_DEBUG
 static PRBool gsDebug1 = PR_FALSE;

layout/tables/nsTableCellFrame.cpp

@@ -60,6 +60,8 @@ nsTableCellFrame::nsTableCellFrame(nsIContent* aContent,
   mColSpan=1;
   mColIndex=0;
   mPriorAvailWidth=0;
+  mPriorDesiredSize.width=0;
+  mPriorDesiredSize.height=0;
 }
 
 nsTableCellFrame::~nsTableCellFrame()
@@ -289,6 +291,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
   mFirstChild->WillReflow(*aPresContext);
   mFirstChild->MoveTo(leftInset, topInset);
   aStatus = ReflowChild(mFirstChild, aPresContext, kidSize, kidReflowState);
+  SetPriorDesiredSize(kidSize);
 
   if (PR_TRUE==gsDebug || PR_TRUE==gsDebugNT)
   {

layout/tables/nsTableCellFrame.h

@@ -84,6 +84,10 @@ public:
   
   virtual void SetPriorAvailWidth(nscoord aPriorAvailWidth);
 
+  virtual nsSize GetPriorDesiredSize();
+
+  virtual void SetPriorDesiredSize(const nsReflowMetrics & aDesiredSize);
+
   virtual ~nsTableCellFrame();
 
   // Get the TableFrame that contains this cell frame
@@ -128,6 +132,8 @@ protected:
   /** the available width we were given in our previous reflow */
   nscoord      mPriorAvailWidth;
 
+  nsSize       mPriorDesiredSize;
+
   nsCellLayoutData *mCellLayoutData;
 
 };
@@ -169,4 +175,13 @@ inline nscoord nsTableCellFrame::GetPriorAvailWidth()
 inline void nsTableCellFrame::SetPriorAvailWidth(nscoord aPriorAvailWidth)
 { mPriorAvailWidth = aPriorAvailWidth;}
 
+inline nsSize nsTableCellFrame::GetPriorDesiredSize()
+{ return mPriorDesiredSize; }
+
+inline void nsTableCellFrame::SetPriorDesiredSize(const nsReflowMetrics & aDesiredSize)
+{ 
+  mPriorDesiredSize.width = aDesiredSize.width;
+  mPriorDesiredSize.height = aDesiredSize.height;
+}
+
 #endif

layout/tables/nsTableRowFrame.cpp

@@ -410,7 +410,7 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext,
 
     // Compute the x-origin for the child, taking into account straddlers (cells from prior
     // rows with rowspans > 1)
-    nscoord x = 0;
+    nscoord x = kidMargin.left;
     PRInt32 cellColIndex = ((nsTableCellFrame *)kidFrame)->GetColIndex();
     for (PRInt32 colIndex=0; colIndex<cellColIndex; colIndex++)
     {
@@ -452,10 +452,9 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext,
     }
     else
     {
-      nsRect cellRect;
+      nsSize priorSize = ((nsTableCellFrame *)kidFrame)->GetPriorDesiredSize();
-      kidFrame->GetRect(cellRect);
+      desiredSize.width = priorSize.width;
-      desiredSize.width = cellRect.width;
+      desiredSize.height = priorSize.height;
-      desiredSize.height = cellRect.height;
       status = NS_FRAME_COMPLETE; // XXX: in paginated world, this doesn't work!
     }