Preparation for combining paths of focus rings and outlines

Source/core/paint/InlinePainter.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/InlinePainter.h"
 
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutTheme.h"
@@ skipping 13 matching lines @@
     // FIXME: When Skia supports annotation rect covering (https://code.google.com/p/skia/issues/detail?id=3872),
     // this rect may be covered by foreground and descendant drawings. Then we may need a dedicated paint phase.
     if (paintInfo.phase == PaintPhaseForeground && paintInfo.isPrinting())
         ObjectPainter(m_layoutInline).addPDFURLRectIfNeeded(paintInfo, paintOffset);
 
     LineBoxListPainter(*m_layoutInline.lineBoxes()).paint(&m_layoutInline, paintInfo, paintOffset);
 }
 
 LayoutRect InlinePainter::outlinePaintRect(const Vector<LayoutRect>& outlineRects, const LayoutPoint& paintOffset) const
 {
-    int outlineOutset = m_layoutInline.styleRef().outlineOutset();
+    int outlineOutset = m_layoutInline.styleRef().outlineOutsetExtent();
     LayoutRect outlineRect;
     for (const LayoutRect& rect : outlineRects) {
         LayoutRect inflatedRect(rect);
         // Inflate the individual rects instead of the union, to avoid losing
         // rects which have degenerate width/height (== isEmpty() true.)
         inflatedRect.inflate(outlineOutset);
         outlineRect.unite(inflatedRect);
     }
     outlineRect.moveBy(paintOffset);
     return outlineRect;
 }
 
 void InlinePainter::paintOutline(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     const ComputedStyle& styleToUse = m_layoutInline.styleRef();
     if (!styleToUse.hasOutline())
         return;
 
     if (styleToUse.outlineStyleIsAuto()) {
         if (!LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_layoutInline))
             return;
         if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutInline, paintInfo.phase))
             return;
 
         Vector<LayoutRect> focusRingRects;
-        m_layoutInline.addFocusRingRects(focusRingRects, paintOffset);
+        m_layoutInline.addOutlineRects(focusRingRects, paintOffset);
 
         LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutInline, paintInfo.phase, outlinePaintRect(focusRingRects, LayoutPoint()));
         // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
         ObjectPainter(m_layoutInline).paintFocusRing(paintInfo, styleToUse, focusRingRects);
         return;
     }
 
     if (styleToUse.outlineStyle() == BNONE)
         return;
 
@@ skipping 145 matching lines @@
             pixelSnappedBox.maxX() + outlineWidth,
             pixelSnappedBox.maxY() + outlineWidth,
             BSBottom, outlineColor, outlineStyle,
             outlineWidth,
             outlineWidth,
             false);
     }
 }
 
 } // namespace blink