added storage in styleTable for a column's width contribution from cells that

have colspan>1.

content/base/src/nsStyleContext.cpp

@@ -617,6 +617,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre
   mRules = NS_STYLE_TABLE_RULES_NONE;
   mCellPadding.Reset();
   mCellSpacing.Reset();
+  mSpanWidth.Reset();
   if (nsnull!=aPresContext)
   {
     float p2t = aPresContext->GetPixelsToTwips();

layout/base/public/nsIStyleContext.h

@@ -168,6 +168,7 @@ struct nsStyleTable: public nsStyleStruct {
   nsStyleCoord  mCellPadding;   // [reset] 
   nsStyleCoord  mCellSpacing;   // [reset] 
   PRInt32       mCols;          // [reset] an integer if set, or see nsStyleConsts.h NS_STYLE_TABLE_COLS_*
+  nsStyleCoord  mSpanWidth;     // [reset] the amount of width this col gets from a spanning cell, if any
   PRInt32       mSpan;          // [reset] the number of columns spanned by a colgroup or col
 
 protected:

layout/base/src/nsStyleContext.cpp

@@ -617,6 +617,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre
   mRules = NS_STYLE_TABLE_RULES_NONE;
   mCellPadding.Reset();
   mCellSpacing.Reset();
+  mSpanWidth.Reset();
   if (nsnull!=aPresContext)
   {
     float p2t = aPresContext->GetPixelsToTwips();

layout/style/nsStyleContext.cpp

@@ -617,6 +617,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre
   mRules = NS_STYLE_TABLE_RULES_NONE;
   mCellPadding.Reset();
   mCellSpacing.Reset();
+  mSpanWidth.Reset();
   if (nsnull!=aPresContext)
   {
     float p2t = aPresContext->GetPixelsToTwips();