Combine outline and focus ring code paths

Source/core/paint/SVGShapePainter.cpp

Index: Source/core/paint/SVGShapePainter.cpp
diff --git a/Source/core/paint/SVGShapePainter.cpp b/Source/core/paint/SVGShapePainter.cpp
index 91a4b01796c1c9fc5cadb7014ae030b0a6ecea6a..28cc0de608e674c428b86d32a4f7153e8517913e 100644
--- a/Source/core/paint/SVGShapePainter.cpp
+++ b/Source/core/paint/SVGShapePainter.cpp
@@ -113,12 +113,8 @@ void SVGShapePainter::paint(const PaintInfo& paintInfo)
         }
     }
 
-    if (m_layoutSVGShape.style()->outlineWidth()) {
-        PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);
-        outlinePaintInfo.phase = PaintPhaseSelfOutline;
-        LayoutRect layoutBoundingBox(boundingBox);
-        ObjectPainter(m_layoutSVGShape).paintOutline(outlinePaintInfo, m_layoutSVGShape.outlineVisualOverflowRect(), layoutBoundingBox.size(), layoutBoundingBox.location());
-    }
+    if (m_layoutSVGShape.style()->outlineWidth())
+        ObjectPainter(m_layoutSVGShape).paintOutline(paintInfoBeforeFiltering, LayoutPoint(boundingBox.location()));
 }
 
 class PathWithTemporaryWindingRule {