Combine outline and focus ring code paths

Source/core/paint/SVGInlineFlowBoxPainter.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/SVGInlineFlowBoxPainter.h"
 
 #include "core/layout/LayoutInline.h"
 #include "core/layout/svg/line/SVGInlineFlowBox.h"
 #include "core/layout/svg/line/SVGInlineTextBox.h"
-#include "core/paint/InlinePainter.h"
+#include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/SVGInlineTextBoxPainter.h"
 #include "core/paint/SVGPaintContext.h"
 
 namespace blink {
 
 void SVGInlineFlowBoxPainter::paintSelectionBackground(const PaintInfo& paintInfo)
 {
     ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
 
@@ skipping 11 matching lines @@
     ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
 
     {
         SVGPaintContext paintContext(m_svgInlineFlowBox.layoutObject(), paintInfo);
         if (paintContext.applyClipMaskAndFilterIfNecessary()) {
             for (InlineBox* child = m_svgInlineFlowBox.firstChild(); child; child = child->nextOnLine())
                 child->paint(paintContext.paintInfo(), paintOffset, 0, 0);
         }
     }
 
-    if (m_svgInlineFlowBox.layoutObject().isLayoutInline())
-        InlinePainter(toLayoutInline(m_svgInlineFlowBox.layoutObject())).paintOutline(paintInfo, paintOffset);
+    if (m_svgInlineFlowBox.layoutObject().styleRef().hasOutline()) {
+        PaintInfo outlinePaintInfo(paintInfo);
+        outlinePaintInfo.phase = PaintPhaseSelfOutline;
+        ObjectPainter(m_svgInlineFlowBox.layoutObject()).paintOutline(outlinePaintInfo, paintOffset);
+    }
 }
 
 } // namespace blink