Refactor ObjectPainter::paintOutline to take a paintOffset

Source/core/paint/ObjectPainter.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/ObjectPainter.h"
 
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/paint/BoxBorderPainter.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/PaintInfo.h"
 #include "core/style/BorderEdge.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/geometry/LayoutPoint.h"
 
 namespace blink {
 
-LayoutRect ObjectPainter::outlineBounds(const LayoutRect& objectBounds, const ComputedStyle& style)
-{
-    LayoutRect outlineBounds(objectBounds);
-    outlineBounds.inflate(style.outlineOutsetExtent());
-    return outlineBounds;
-}
-
 void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const ComputedStyle& style, const Vector<LayoutRect>& focusRingRects)
 {
     ASSERT(style.outlineStyleIsAuto());
     Vector<IntRect> focusRingIntRects;
     for (size_t i = 0; i < focusRingRects.size(); ++i)
         focusRingIntRects.append(pixelSnappedIntRect(focusRingRects[i]));
     paintInfo.context->drawFocusRing(focusRingIntRects, style.outlineWidth(), style.outlineOffset(), m_layoutObject.resolveColor(style, CSSPropertyOutlineColor));
 }
 
-void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& objectBounds, const LayoutRect& visualOverflowBounds)
+void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& visualOverflowRect, const LayoutSize& objectSize, const LayoutPoint& paintOffset)
 {
     const ComputedStyle& styleToUse = m_layoutObject.styleRef();
     if (!styleToUse.hasOutline())
         return;
 
     if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutObject, paintInfo.phase))
         return;
 
+    LayoutRect visualOverflowBounds(visualOverflowRect);
+    visualOverflowBounds.moveBy(paintOffset);
     LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutObject, paintInfo.phase, visualOverflowBounds);
 
     if (styleToUse.outlineStyleIsAuto()) {
         if (LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_layoutObject)) {
             // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
             Vector<LayoutRect> focusRingRects;
-            m_layoutObject.addOutlineRects(focusRingRects, objectBounds.location());
+            m_layoutObject.addOutlineRects(focusRingRects, paintOffset);
             paintFocusRing(paintInfo, styleToUse, focusRingRects);
         }
         return;
     }
 
     if (styleToUse.outlineStyle() == BNONE)
         return;
 
-    LayoutRect inner(pixelSnappedIntRect(objectBounds));
+    LayoutRect inner(paintOffset, objectSize);
+    inner = LayoutRect(pixelSnappedIntRect(inner));
     inner.inflate(styleToUse.outlineOffset());
 
     LayoutRect outer(inner);
     int outlineWidth = styleToUse.outlineWidth();
     outer.inflate(outlineWidth);
 
     const BorderEdge commonEdgeInfo(outlineWidth,
         m_layoutObject.resolveColor(styleToUse, CSSPropertyOutlineColor), styleToUse.outlineStyle());
     BoxBorderPainter(styleToUse, outer, inner, commonEdgeInfo).paintBorder(paintInfo, outer);
 }
@@ skipping 270 matching lines @@
         quad[1] = FloatPoint(x1, y2 - std::max(adjacentWidth2, 0));
         quad[2] = FloatPoint(x2, y2 - std::max(-adjacentWidth2, 0));
         quad[3] = FloatPoint(x2, y1 + std::max(-adjacentWidth1, 0));
         break;
     }
 
     graphicsContext->fillPolygon(4, quad, color, antialias);
 }
 
 } // namespace blink