Combine outline and focus ring code paths

Source/core/paint/SVGImagePainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/SVGImagePainter.h"
 
 #include "core/layout/ImageQualityController.h"
 #include "core/layout/LayoutImageResource.h"
 #include "core/layout/svg/LayoutSVGImage.h"
@@ skipping 37 matching lines @@
                     paintContext.paintInfo().context->beginRecording(m_layoutSVGImage.objectBoundingBox());
                     paintForeground(paintContext.paintInfo());
                     bufferedForeground = paintContext.paintInfo().context->endRecording();
                 }
 
                 paintContext.paintInfo().context->drawPicture(bufferedForeground.get());
             }
         }
     }
 
-    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)
 {
     RefPtr<Image> image = m_layoutSVGImage.imageResource()->image();
     FloatRect destRect = m_layoutSVGImage.objectBoundingBox();
     FloatRect srcRect(0, 0, image->width(), image->height());
 
     SVGImageElement* imageElement = toSVGImageElement(m_layoutSVGImage.element());
     imageElement->preserveAspectRatio()->currentValue()->transformRect(destRect, srcRect);
 
     InterpolationQuality interpolationQuality = InterpolationDefault;
     if (m_layoutSVGImage.style()->svgStyle().bufferedRendering() != BR_STATIC || RuntimeEnabledFeatures::slimmingPaintEnabled())
         interpolationQuality = ImageQualityController::imageQualityController()->chooseInterpolationQuality(paintInfo.context, &m_layoutSVGImage, image.get(), image.get(), LayoutSize(destRect.size()));
 
     InterpolationQuality previousInterpolationQuality = paintInfo.context->imageInterpolationQuality();
     paintInfo.context->setImageInterpolationQuality(interpolationQuality);
     paintInfo.context->drawImage(image.get(), destRect, srcRect, SkXfermode::kSrcOver_Mode);
     paintInfo.context->setImageInterpolationQuality(previousInterpolationQuality);
 }
 
 } // namespace blink