Combine outline and focus ring code paths

Source/core/paint/SVGImagePainter.cpp

Index: Source/core/paint/SVGImagePainter.cpp
diff --git a/Source/core/paint/SVGImagePainter.cpp b/Source/core/paint/SVGImagePainter.cpp
index 9bfeb7c944298afc9c27888af482980884739c36..91734ae0668eeb66e5bb70f3d68186c8f93acf91 100644
--- a/Source/core/paint/SVGImagePainter.cpp
+++ b/Source/core/paint/SVGImagePainter.cpp
@@ -55,12 +55,8 @@ void SVGImagePainter::paint(const PaintInfo& paintInfo)
         }
     }
 
-    if (m_layoutSVGImage.style()->outlineWidth()) {
-        PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);
-        outlinePaintInfo.phase = PaintPhaseSelfOutline;
-        LayoutRect layoutBoundingBox(boundingBox);
-        ObjectPainter(m_layoutSVGImage).paintOutline(outlinePaintInfo, m_layoutSVGImage.outlineVisualOverflowRect(), layoutBoundingBox.size(), layoutBoundingBox.location());
-    }
+    if (m_layoutSVGImage.style()->outlineWidth())
+        ObjectPainter(m_layoutSVGImage).paintOutline(paintInfoBeforeFiltering, LayoutPoint(boundingBox.location()));
 }
 
 void SVGImagePainter::paintForeground(const PaintInfo& paintInfo)