Combine outline and focus ring code paths

Source/core/paint/ObjectPainter.h

Index: Source/core/paint/ObjectPainter.h
diff --git a/Source/core/paint/ObjectPainter.h b/Source/core/paint/ObjectPainter.h
index a380fbec6360211aef3a2cdb0f8f53924afa668f..14a91bcf5d5eb9536003254d219e7b0e4aa2e1bb 100644
--- a/Source/core/paint/ObjectPainter.h
+++ b/Source/core/paint/ObjectPainter.h
@@ -23,8 +23,8 @@ class ObjectPainter {
 public:
     ObjectPainter(LayoutObject& layoutObject) : m_layoutObject(layoutObject) { }
 
-    void paintOutline(const PaintInfo&, const LayoutRect& visualOverflowRect, const LayoutSize& objectSize, const LayoutPoint& paintOffset);
-    void paintFocusRing(const PaintInfo&, const ComputedStyle&, const Vector<LayoutRect>& focusRingRects);
+    void paintOutline(const PaintInfo&, const LayoutPoint& paintOffset);
+    void paintInlineChildrenOutlines(const PaintInfo&, const LayoutPoint& paintOffset);
     void addPDFURLRectIfNeeded(const PaintInfo&, const LayoutPoint& paintOffset);
 
     static void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, BoxSide, Color, EBorderStyle, int adjbw1, int adjbw2, bool antialias = false);