Stateful BoxBorderPainter

Source/core/paint/BoxPainter.cpp

Index: Source/core/paint/BoxPainter.cpp
diff --git a/Source/core/paint/BoxPainter.cpp b/Source/core/paint/BoxPainter.cpp
index 4ccd991b64153a65a34747e058f3c7ecd4fe0694..114e48926124ed671e08d1db0d7316e2a6066e67 100644
--- a/Source/core/paint/BoxPainter.cpp
+++ b/Source/core/paint/BoxPainter.cpp
@@ -1172,9 +1172,17 @@ bool BoxPainter::allCornersClippedOut(const FloatRoundedRect& border, const IntR
     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)