Fixed it so tables that don't want a border don't get a border

layout/html/table/src/nsTableFrame.cpp

@@ -1060,11 +1060,8 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext,
   if (disp->mVisible) {
     const nsStyleSpacing* spacing =
       (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing);
-
-    // Use our parent's color style structure, because we're a pseudo frame
-    // and that the style system marks us as having a transparent background
-    const nsStyleColor* color;
-    mGeometricParent->GetStyleData(eStyleStruct_Color, (nsStyleStruct*&)color);
+    const nsStyleColor* color =
+      (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color);
 
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, mRect, *color);
@@ -2705,7 +2702,6 @@ void nsTableFrame::MapHTMLBorderStyle(nsStyleSpacing& aSpacingStyle, nscoord aBo
   aSpacingStyle.mBorderStyle[NS_SIDE_LEFT] = NS_STYLE_BORDER_STYLE_OUTSET; 
   aSpacingStyle.mBorderStyle[NS_SIDE_BOTTOM] = NS_STYLE_BORDER_STYLE_OUTSET; 
   aSpacingStyle.mBorderStyle[NS_SIDE_RIGHT] = NS_STYLE_BORDER_STYLE_OUTSET; 
-  
 
   nsIStyleContext* styleContext = mStyleContext; 
   const nsStyleColor* colorData = (const nsStyleColor*)
@@ -2817,7 +2813,13 @@ NS_METHOD nsTableFrame::DidSetStyleContext(nsIPresContext* aPresContext)
 #ifdef NOISY_STYLE
   printf("nsTableFrame::DidSetStyleContext \n");
 #endif
+  // XXX This may have been needed before we had a style system, but it's not
+  // needed now. It's forcing the table to always have a border (which is bad),
+  // and it's duplicating the border-syle and border-color information that's
+  // in the ua.css
+#if 0
   MapBorderMarginPadding(aPresContext);
+#endif
   return NS_OK;
 }
 

layout/html/table/src/nsTableOuterFrame.cpp

@@ -825,10 +825,9 @@ nsresult nsTableOuterFrame::CreateInnerTableFrame(nsIPresContext* aPresContext,
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    // Resolve style and set the style context
-    nsIStyleContextPtr styleContext =
-      aPresContext->ResolveStyleContextFor(mContent, this);
-    aTableFrame->SetStyleContext(aPresContext,styleContext);
+    // Resolve style and set the style context. Have the inner table use our
+    // style context
+    aTableFrame->SetStyleContext(aPresContext, mStyleContext);
 
   } else {
     // Create a continuing column

layout/html/table/src/nsTablePart.cpp

@@ -762,12 +762,15 @@ void nsTablePart::GetTableBorder(nsIHTMLContent* aContent,
     else {
       twips.SetCoordValue(nscoord(NS_INT_PIXELS_TO_TWIPS(value.GetPixelValue(), p2t)));
     }
+
+#if 0
     nsStyleCoord  two(nscoord(NS_INT_PIXELS_TO_TWIPS(2,p2t)));
 
     spacing->mPadding.SetTop(two);
     spacing->mPadding.SetRight(two);
     spacing->mPadding.SetBottom(two);
     spacing->mPadding.SetLeft(two);
+#endif
 
     spacing->mBorder.SetTop(twips);
     spacing->mBorder.SetRight(twips);

layout/tables/nsTableFrame.cpp

@@ -1060,11 +1060,8 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext,
   if (disp->mVisible) {
     const nsStyleSpacing* spacing =
       (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing);
-
-    // Use our parent's color style structure, because we're a pseudo frame
-    // and that the style system marks us as having a transparent background
-    const nsStyleColor* color;
-    mGeometricParent->GetStyleData(eStyleStruct_Color, (nsStyleStruct*&)color);
+    const nsStyleColor* color =
+      (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color);
 
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, mRect, *color);
@@ -2705,7 +2702,6 @@ void nsTableFrame::MapHTMLBorderStyle(nsStyleSpacing& aSpacingStyle, nscoord aBo
   aSpacingStyle.mBorderStyle[NS_SIDE_LEFT] = NS_STYLE_BORDER_STYLE_OUTSET; 
   aSpacingStyle.mBorderStyle[NS_SIDE_BOTTOM] = NS_STYLE_BORDER_STYLE_OUTSET; 
   aSpacingStyle.mBorderStyle[NS_SIDE_RIGHT] = NS_STYLE_BORDER_STYLE_OUTSET; 
-  
 
   nsIStyleContext* styleContext = mStyleContext; 
   const nsStyleColor* colorData = (const nsStyleColor*)
@@ -2817,7 +2813,13 @@ NS_METHOD nsTableFrame::DidSetStyleContext(nsIPresContext* aPresContext)
 #ifdef NOISY_STYLE
   printf("nsTableFrame::DidSetStyleContext \n");
 #endif
+  // XXX This may have been needed before we had a style system, but it's not
+  // needed now. It's forcing the table to always have a border (which is bad),
+  // and it's duplicating the border-syle and border-color information that's
+  // in the ua.css
+#if 0
   MapBorderMarginPadding(aPresContext);
+#endif
   return NS_OK;
 }
 

layout/tables/nsTableOuterFrame.cpp

@@ -825,10 +825,9 @@ nsresult nsTableOuterFrame::CreateInnerTableFrame(nsIPresContext* aPresContext,
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    // Resolve style and set the style context
-    nsIStyleContextPtr styleContext =
-      aPresContext->ResolveStyleContextFor(mContent, this);
-    aTableFrame->SetStyleContext(aPresContext,styleContext);
+    // Resolve style and set the style context. Have the inner table use our
+    // style context
+    aTableFrame->SetStyleContext(aPresContext, mStyleContext);
 
   } else {
     // Create a continuing column