Combine outline and focus ring code paths

Source/core/paint/SVGShapePainter.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/SVGShapePainter.h"
 
 #include "core/layout/svg/LayoutSVGPath.h"
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 #include "core/layout/svg/LayoutSVGShape.h"
@@ skipping 95 matching lines @@
                     paintMarkers(paintContext.paintInfo(), boundingBox);
                     break;
                 default:
                     ASSERT_NOT_REACHED();
                     break;
                 }
             }
         }
     }
 
-    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 {
 public:
     PathWithTemporaryWindingRule(Path& path, SkPath::FillType fillType)
         : m_path(const_cast<SkPath&>(path.skPath()))
     {
         m_savedFillType = m_path.getFillType();
         m_path.setFillType(fillType);
     }
@@ skipping 123 matching lines @@
             position = nonScalingTransform.mapPoint(position);
         FloatRect subpathRect = LayoutSVGPath::zeroLengthSubpathRect(position, m_layoutSVGShape.strokeWidth());
         if (m_layoutSVGShape.style()->svgStyle().capStyle() == SquareCap)
             context->drawRect(subpathRect, fillPaint);
         else
             context->drawOval(subpathRect, fillPaint);
     }
 }
 
 } // namespace blink