Preparation for combining paths of focus rings and outlines

Source/core/paint/InlinePainter.cpp

Index: Source/core/paint/InlinePainter.cpp
diff --git a/Source/core/paint/InlinePainter.cpp b/Source/core/paint/InlinePainter.cpp
index f591f415968f39eeeea921300e1092f95657a8a9..af7e48d24f65ee619872a0b115b7801d3933d3c5 100644
--- a/Source/core/paint/InlinePainter.cpp
+++ b/Source/core/paint/InlinePainter.cpp
@@ -31,7 +31,7 @@ void InlinePainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOf
 
 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);
@@ -57,7 +57,7 @@ void InlinePainter::paintOutline(const PaintInfo& paintInfo, const LayoutPoint&
             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.