Move line painting to BlockFlowPainter.

third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2827 matching lines @@
         startOfContinuations = inlineElementContinuation->node()->layoutObject();
     } else if (LayoutObject* firstChild = this->firstChild()) {
         // This block is the anonymous containing block of an inline element continuation.
         if (firstChild->isElementContinuation())
             startOfContinuations = firstChild->node()->layoutObject();
     }
     if (startOfContinuations && startOfContinuations->styleRef().outlineStyleIsAuto())
         startOfContinuations->invalidateDisplayItemClient(*startOfContinuations);
 }
 
-void LayoutBlockFlow::paintFloats(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
+void LayoutBlockFlow::paintContentsAndFloats(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
-    BlockFlowPainter(*this).paintFloats(paintInfo, paintOffset);
+    BlockFlowPainter(*this).paintContentsAndFloats(paintInfo, paintOffset);
 }
 
 void LayoutBlockFlow::clipOutFloatingObjects(const LayoutBlock* rootBlock, ClipScope& clipScope,
     const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock) const
 {
     if (!m_floatingObjects)
         return;
 
     const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
     FloatingObjectSetIterator end = floatingObjectSet.end();
@@ skipping 985 matching lines @@
             if (!rect.isEmpty())
                 rects.append(rect);
         }
     }
 
     if (inlineElementContinuation)
         inlineElementContinuation->addOutlineRects(rects, additionalOffset + (inlineElementContinuation->containingBlock()->location() - location()), includeBlockOverflows);
 }
 
 } // namespace blink