Should paint border before background when bleedAvoidance is BackgroundBleedBackgroundOverBorder

Source/core/rendering/RenderBox.cpp

Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index c94e5696206227e9d4cd65472165c0c1819f2050..48aa69724011cf867cd0c828c17d66e750f11752 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -1346,7 +1346,7 @@ void RenderBox::paintBackgroundWithBorderAndBoxShadow(PaintInfo& paintInfo, cons
     paintBoxShadow(paintInfo, paintRect, style(), Inset);
 
     // The theme will tell us whether or not we should also paint the CSS border.
-    if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasAppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, paintInfo, snappedPaintRect))) && style()->hasBorder())
+    if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasAppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, paintInfo, snappedPaintRect))) && style()->hasBorder() && !collapseBorders())

[Julien - ping for review, 2013/12/03 22:57:50]

I would much prefer not making collapseBorders() virtual as it only makes sense
for tables! This code could be replaced by:
(isTable() && toRenderTable())->collapseBorders())

[tasak, 2013/12/05 04:00:28]

I see. Done.

         paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
 }