Move a bunch more painting code out of RenderBoxModelObject and into BoxPainter.

Source/core/rendering/RenderFieldset.cpp

Index: Source/core/rendering/RenderFieldset.cpp
diff --git a/Source/core/rendering/RenderFieldset.cpp b/Source/core/rendering/RenderFieldset.cpp
index 68d9ad2ca76c8d93b58493380e9c8ebae05d9110..2ac064f6ab9755ceccc8dc63f64d5bf517090790 100644
--- a/Source/core/rendering/RenderFieldset.cpp
+++ b/Source/core/rendering/RenderFieldset.cpp
@@ -163,10 +163,11 @@ void RenderFieldset::paintBoxDecorationBackground(PaintInfo& paintInfo, const La
 
     BoxDecorationData boxDecorationData(*style(), canRenderBorderImage(), backgroundHasOpaqueTopLayer(), paintInfo.context);
 
+    BoxPainter boxPainter(*this);
     if (boxDecorationData.bleedAvoidance() == BackgroundBleedNone)
-        paintBoxShadow(paintInfo, paintRect, style(), Normal);
-    BoxPainter(*this).paintFillLayers(paintInfo, boxDecorationData.backgroundColor, style()->backgroundLayers(), paintRect);
-    paintBoxShadow(paintInfo, paintRect, style(), Inset);
+        boxPainter.paintBoxShadow(paintInfo, paintRect, style(), Normal);
+    boxPainter.paintFillLayers(paintInfo, boxDecorationData.backgroundColor, style()->backgroundLayers(), paintRect);
+    boxPainter.paintBoxShadow(paintInfo, paintRect, style(), Inset);
 
     if (!boxDecorationData.hasBorder)
         return;
@@ -188,7 +189,7 @@ void RenderFieldset::paintBoxDecorationBackground(PaintInfo& paintInfo, const La
         graphicsContext->clipOut(pixelSnappedIntRect(clipLeft, paintRect.y() + legend->y(), clipWidth, legend->height()));
     }
 
-    paintBorder(paintInfo, paintRect, style());
+    BoxPainter(*this).paintBorder(paintInfo, paintRect, style());

[pdr., 2014/09/11 21:00:39]

Can you use the boxPainter local from above?

[chrishtr, 2014/09/11 21:26:35]

Done.

 }
 
 void RenderFieldset::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)