Stateful BoxBorderPainter

Source/core/paint/BoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/BoxPainter.h"
 
 #include "core/HTMLNames.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
@@ skipping 1154 matching lines @@
 
     LayoutRect bottomRightRect(boundingRect.location(), LayoutSize(radii.bottomRight()));
     bottomRightRect.setX(boundingRect.maxX() - bottomRightRect.width());
     bottomRightRect.setY(boundingRect.maxY() - bottomRightRect.height());
     if (clipRect.intersects(bottomRightRect))
         return false;
 
     return true;
 }
 
-void BoxPainter::paintBorder(LayoutBoxModelObject& obj, const PaintInfo& info, const LayoutRect& rect, const ComputedStyle& style, BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
+void BoxPainter::paintBorder(LayoutBoxModelObject& obj, const PaintInfo& info,
+    const LayoutRect& rect, const ComputedStyle& style, BackgroundBleedAvoidance bleedAvoidance,
+    bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
 {
-    BoxBorderPainter().paintBorder(obj, info, rect, style, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge);
+    // border-image is not affected by border-radius.
+    if (paintNinePieceImage(obj, info.context, rect, style, style.borderImage()))
+        return;
+
+    const BoxBorderPainter borderPainter(rect, style, info.rect, bleedAvoidance,
+        includeLogicalLeftEdge, includeLogicalRightEdge);
+    borderPainter.paintBorder(info, rect);
 }
 
 void BoxPainter::paintBoxShadow(const PaintInfo& info, const LayoutRect& paintRect, const ComputedStyle& style, ShadowStyle shadowStyle, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
 {
     // FIXME: Deal with border-image. Would be great to use border-image as a mask.
     GraphicsContext* context = info.context;
     if (!style.boxShadow())
         return;
     FloatRoundedRect border = (shadowStyle == Inset) ? style.getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
         : style.getRoundedBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge);
@@ skipping 106 matching lines @@
                 else
                     clippedEdges |= GraphicsContext::BottomEdge;
             }
             // TODO: support non-integer shadows - crbug.com/334828
             context->drawInnerShadow(border, shadowColor, flooredIntSize(shadowOffset), shadowBlur, shadowSpread, clippedEdges);
         }
     }
 }
 
 } // namespace blink