Break LayoutObject dependency for NinePieceImagePainter

third_party/WebKit/Source/core/paint/BoxPainterBase.cpp

Index: third_party/WebKit/Source/core/paint/BoxPainterBase.cpp
diff --git a/third_party/WebKit/Source/core/paint/BoxPainterBase.cpp b/third_party/WebKit/Source/core/paint/BoxPainterBase.cpp
index b059b5a701f3424f5ba88ab0a9eddbcbd48d25c9..ffde753d072264e0c235a95589fdd5d498a29367 100644
--- a/third_party/WebKit/Source/core/paint/BoxPainterBase.cpp
+++ b/third_party/WebKit/Source/core/paint/BoxPainterBase.cpp
@@ -6,6 +6,8 @@
 
 #include "core/dom/Document.h"
 #include "core/frame/Settings.h"
+#include "core/paint/BoxBorderPainter.h"
+#include "core/paint/NinePieceImagePainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/style/BorderEdge.h"
 #include "core/style/ComputedStyle.h"
@@ -378,4 +380,25 @@ FloatRoundedRect BoxPainterBase::RoundedBorderRectForClip(
   return border;
 }
 
+void BoxPainterBase::PaintBorder(const ImageResourceObserver& obj,
+                                 const Document& document,
+                                 Node* node,
+                                 const PaintInfo& info,
+                                 const LayoutRect& rect,
+                                 const ComputedStyle& style,
+                                 BackgroundBleedAvoidance bleed_avoidance,
+                                 bool include_logical_left_edge,
+                                 bool include_logical_right_edge) {
+  // border-image is not affected by border-radius.
+  if (NinePieceImagePainter::Paint(info.context, obj, document, node, rect,
+                                   style, style.BorderImage())) {
+    return;
+  }
+
+  const BoxBorderPainter border_painter(rect, style, bleed_avoidance,
+                                        include_logical_left_edge,
+                                        include_logical_right_edge);
+  border_painter.PaintBorder(info, rect);
+}
+
 }  // namespace blink