Push selection gaps logic down to RenderBlockFlow

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/Caret.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 178 matching lines @@
         if (m_renderBlock.hasColumns())
             paintColumnContents(paintInfo, scrolledOffset);
         else
             paintContents(paintInfo, scrolledOffset);
     }
 
     // 3. paint selection
     // FIXME: Make this work with multi column layouts. For now don't fill gaps.
     bool isPrinting = m_renderBlock.document().printing();
     if (!isPrinting && !m_renderBlock.hasColumns())
-        paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on lines and between blocks.
+        m_renderBlock.paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on lines and between blocks.
 
     // 4. paint floats.
     if (paintPhase == PaintPhaseFloat || paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip) {
         if (m_renderBlock.hasColumns())
             paintColumnContents(paintInfo, scrolledOffset, true);
         else
             m_renderBlock.paintFloats(paintInfo, scrolledOffset, paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip);
     }
 
     // 5. paint outline.
@@ skipping 224 matching lines @@
         newPhase = (newPhase == PaintPhaseChildBlockBackgrounds) ? PaintPhaseChildBlockBackground : newPhase;
 
         // We don't paint our own background, but we do let the kids paint their backgrounds.
         PaintInfo paintInfoForChild(paintInfo);
         paintInfoForChild.phase = newPhase;
         paintInfoForChild.updatePaintingRootForChildren(&m_renderBlock);
         m_renderBlock.paintChildren(paintInfoForChild, paintOffset);
     }
 }
 
-void BlockPainter::paintSelection(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
-{
-    if (m_renderBlock.shouldPaintSelectionGaps() && paintInfo.phase == PaintPhaseForeground) {
-        LayoutUnit lastTop = 0;
-        LayoutUnit lastLeft = m_renderBlock.logicalLeftSelectionOffset(&m_renderBlock, lastTop);
-        LayoutUnit lastRight = m_renderBlock.logicalRightSelectionOffset(&m_renderBlock, lastTop);
-        GraphicsContextStateSaver stateSaver(*paintInfo.context);
-
-        LayoutRect gapRectsBounds = m_renderBlock.selectionGaps(&m_renderBlock, paintOffset, LayoutSize(), lastTop, lastLeft, lastRight, &paintInfo);
-        if (!gapRectsBounds.isEmpty()) {
-            RenderLayer* layer = m_renderBlock.enclosingLayer();
-            gapRectsBounds.moveBy(-paintOffset);
-            if (!m_renderBlock.hasLayer()) {
-                LayoutRect localBounds(gapRectsBounds);
-                m_renderBlock.flipForWritingMode(localBounds);
-                gapRectsBounds = m_renderBlock.localToContainerQuad(FloatRect(localBounds), layer->renderer()).enclosingBoundingBox();
-                if (layer->renderer()->hasOverflowClip())
-                    gapRectsBounds.move(layer->renderBox()->scrolledContentOffset());
-            }
-            layer->addBlockSelectionGapsBounds(gapRectsBounds);
-        }
-    }
-}
-
 void BlockPainter::paintContinuationOutlines(PaintInfo& info, const LayoutPoint& paintOffset)
 {
     RenderInline* inlineCont = m_renderBlock.inlineElementContinuation();
     if (inlineCont && inlineCont->style()->hasOutline() && inlineCont->style()->visibility() == VISIBLE) {
         RenderInline* inlineRenderer = toRenderInline(inlineCont->node()->renderer());
         RenderBlock* cb = m_renderBlock.containingBlock();
 
         bool inlineEnclosedInSelfPaintingLayer = false;
         for (RenderBoxModelObject* box = inlineRenderer; box != cb; box = box->parent()->enclosingBoxModelObject()) {
             if (box->hasSelfPaintingLayer()) {
@@ skipping 28 matching lines @@
         RenderBlock* block = flow->containingBlock();
         for ( ; block && block != &m_renderBlock; block = block->containingBlock())
             accumulatedPaintOffset.moveBy(block->location());
         ASSERT(block);
         InlinePainter(*flow).paintOutline(info, accumulatedPaintOffset);
     }
 }
 
 
 } // namespace blink