Refactor ObjectPainter::paintOutline to take a paintOffset

Source/core/paint/BlockPainter.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/BlockPainter.h"
 
 #include "core/editing/DragCaretController.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/Settings.h"
@@ skipping 144 matching lines @@
         layoutObject.paint(info, childPoint);
         info.phase = PaintPhaseFloat;
         layoutObject.paint(info, childPoint);
         info.phase = PaintPhaseForeground;
         layoutObject.paint(info, childPoint);
         info.phase = PaintPhaseOutline;
         layoutObject.paint(info, childPoint);
     }
 }
 
-static inline LayoutRect visualOverflowRectWithPaintOffset(const LayoutBlock& layoutBox, const LayoutPoint& paintOffset)
-{
-    if (!RuntimeEnabledFeatures::slimmingPaintEnabled())

[chrishtr, 2015/08/27 04:20:41]

This flag conditional is not needed any more?

[pdr., 2015/08/27 05:00:16]

It was only present as a performance optimization to not compute the visual
overflow rect w/o slimming paint. Everything will still work without slimming
paint, we'll just compute this unnecessarily.

-        return LayoutRect();
-    LayoutRect bounds = layoutBox.visualOverflowRect();
-    bounds.moveBy(paintOffset);
-    return bounds;
-}
-
 void BlockPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     const PaintPhase paintPhase = paintInfo.phase;
 
     if ((paintPhase == PaintPhaseBlockBackground || paintPhase == PaintPhaseChildBlockBackground)
         && m_layoutBlock.style()->visibility() == VISIBLE
         && m_layoutBlock.hasBoxDecorationBackground())
         m_layoutBlock.paintBoxDecorationBackground(paintInfo, paintOffset);
 
     if (paintPhase == PaintPhaseMask && m_layoutBlock.style()->visibility() == VISIBLE) {
@@ skipping 36 matching lines @@
             m_layoutBlock.paintSelection(contentsPaintInfo, paintOffset); // Fill in gaps in selection on lines and between blocks.
 
         if (paintPhase == PaintPhaseFloat || paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip)
             m_layoutBlock.paintFloats(contentsPaintInfo, paintOffset, paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip);
     }
 
     if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && m_layoutBlock.style()->hasOutline() && m_layoutBlock.style()->visibility() == VISIBLE) {
         // Don't paint focus ring for anonymous block continuation because the
         // inline element having outline-style:auto paints the whole focus ring.
         if (!m_layoutBlock.style()->outlineStyleIsAuto() || !m_layoutBlock.isAnonymousBlockContinuation())
-            ObjectPainter(m_layoutBlock).paintOutline(paintInfo, LayoutRect(paintOffset, m_layoutBlock.size()), visualOverflowRectWithPaintOffset(m_layoutBlock, paintOffset));
+            ObjectPainter(m_layoutBlock).paintOutline(paintInfo, m_layoutBlock.visualOverflowRect(), m_layoutBlock.size(), paintOffset);
     }
 
     if (paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseChildOutlines)
         paintContinuationOutlines(paintInfo, paintOffset);
 
     // If the caret's node's layout object's containing block is this block, and the paint action is PaintPhaseForeground,
     // then paint the caret.
     if (paintPhase == PaintPhaseForeground && hasCaret() && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutBlock, DisplayItem::Caret)) {
-        LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutBlock, DisplayItem::Caret, visualOverflowRectWithPaintOffset(m_layoutBlock, paintOffset));
+        LayoutRect bounds = m_layoutBlock.visualOverflowRect();
+        bounds.moveBy(paintOffset);
+        LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutBlock, DisplayItem::Caret, bounds);
         paintCarets(paintInfo, paintOffset);
     }
 }
 
 static inline bool caretBrowsingEnabled(const LocalFrame* frame)
 {
     Settings* settings = frame->settings();
     return settings && settings->caretBrowsingEnabled();
 }
 
@@ skipping 104 matching lines @@
         LayoutBlock* block = flow->containingBlock();
         for ( ; block && block != &m_layoutBlock; block = block->containingBlock())
             accumulatedPaintOffset.moveBy(block->location());
         ASSERT(block);
         InlinePainter(*flow).paintOutline(info, accumulatedPaintOffset);
     }
 }
 
 
 } // namespace blink