oops, there were duplicate entries for border collapse values. Now there's not.

content/base/src/nsStyleContext.cpp

@@ -661,7 +661,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre
   mCols  = NS_STYLE_TABLE_COLS_NONE;
   mFrame = NS_STYLE_TABLE_FRAME_NONE;
   mRules = NS_STYLE_TABLE_RULES_NONE;
-  mBorderCollapse = NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE;    //XXX: should inherit
+  mBorderCollapse = NS_STYLE_BORDER_SEPARATE;                   //XXX: should inherit
   mEmptyCells = NS_STYLE_TABLE_EMPTY_CELLS_HIDE;                //XXX: should inherit
   mCaptionSide = NS_SIDE_TOP;                                   //XXX: should inherit
   mCellPadding.Reset();

layout/base/nsStyleConsts.h

@@ -409,12 +409,8 @@
 #define NS_STYLE_TABLE_EMPTY_CELLS_HIDE         0
 #define NS_STYLE_TABLE_EMPTY_CELLS_SHOW         1
 
-#define NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE 0
-#define NS_STYLE_TABLE_BORDER_COLLAPSE_COLLAPSE 1
-
 // CAPTION_SIDE uses NS_SIDE_*
 
-
 // constants for cell "scope" attribute
 #define NS_STYLE_CELL_SCOPE_ROW                 0
 #define NS_STYLE_CELL_SCOPE_COL                 1

layout/base/public/nsStyleConsts.h

@@ -409,12 +409,8 @@
 #define NS_STYLE_TABLE_EMPTY_CELLS_HIDE         0
 #define NS_STYLE_TABLE_EMPTY_CELLS_SHOW         1
 
-#define NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE 0
-#define NS_STYLE_TABLE_BORDER_COLLAPSE_COLLAPSE 1
-
 // CAPTION_SIDE uses NS_SIDE_*
 
-
 // constants for cell "scope" attribute
 #define NS_STYLE_CELL_SCOPE_ROW                 0
 #define NS_STYLE_CELL_SCOPE_COL                 1

layout/base/src/nsStyleContext.cpp

@@ -661,7 +661,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre
   mCols  = NS_STYLE_TABLE_COLS_NONE;
   mFrame = NS_STYLE_TABLE_FRAME_NONE;
   mRules = NS_STYLE_TABLE_RULES_NONE;
-  mBorderCollapse = NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE;    //XXX: should inherit
+  mBorderCollapse = NS_STYLE_BORDER_SEPARATE;                   //XXX: should inherit
   mEmptyCells = NS_STYLE_TABLE_EMPTY_CELLS_HIDE;                //XXX: should inherit
   mCaptionSide = NS_SIDE_TOP;                                   //XXX: should inherit
   mCellPadding.Reset();

layout/style/nsStyleContext.cpp

@@ -661,7 +661,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre
   mCols  = NS_STYLE_TABLE_COLS_NONE;
   mFrame = NS_STYLE_TABLE_FRAME_NONE;
   mRules = NS_STYLE_TABLE_RULES_NONE;
-  mBorderCollapse = NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE;    //XXX: should inherit
+  mBorderCollapse = NS_STYLE_BORDER_SEPARATE;                   //XXX: should inherit
   mEmptyCells = NS_STYLE_TABLE_EMPTY_CELLS_HIDE;                //XXX: should inherit
   mCaptionSide = NS_SIDE_TOP;                                   //XXX: should inherit
   mCellPadding.Reset();