Remove special-code for paginating floats followed by lines of text.

third_party/WebKit/Source/core/layout/line/LineBreaker.cpp

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All right reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/layout/line/LineBreaker.h"
 
 #include "core/layout/line/BreakingContextInlineHeaders.h"
 
 namespace blink {
 
-void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo& lineInfo,
-    FloatingObject* lastFloatFromPreviousLine, LineWidth& width)
+void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo& lineInfo, LineWidth& width)
 {
     while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) {
         LineLayoutItem lineLayoutItem = resolver.position().getLineLayoutItem();
         if (lineLayoutItem.isOutOfFlowPositioned()) {
             setStaticPositions(m_block, LineLayoutBox(lineLayoutItem), width.indentText());
             if (lineLayoutItem.style()->isOriginalDisplayInlineType()) {
                 resolver.runs().addRun(createRun(0, 1, LineLayoutItem(lineLayoutItem), resolver));
                 lineInfo.incrementRunsFromLeadingWhitespace();
             }
         } else if (lineLayoutItem.isFloating()) {
-            m_block.positionNewFloatOnLine(*m_block.insertFloatingObject(LineLayoutBox(lineLayoutItem)), lastFloatFromPreviousLine, lineInfo, width);
+            m_block.insertFloatingObject(LineLayoutBox(lineLayoutItem));
+            m_block.positionNewFloats(&width);
         }
         resolver.position().increment(&resolver);
     }
     resolver.commitExplicitEmbedding(resolver.runs());
 }
 
 void LineBreaker::reset()
 {
     m_positionedObjects.clear();
     m_hyphenated = false;
     m_clear = ClearNone;
 }
 
 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo& lineInfo,
-    LayoutTextInfo& layoutTextInfo, FloatingObject* lastFloatFromPreviousLine,
-    WordMeasurements& wordMeasurements)
+    LayoutTextInfo& layoutTextInfo, WordMeasurements& wordMeasurements)
 {
     reset();
 
     ASSERT(resolver.position().root() == m_block);
 
     bool appliedStartWidth = resolver.position().offset() > 0;
 
     LineWidth width(m_block, lineInfo.isFirstLine(), requiresIndent(lineInfo.isFirstLine(), lineInfo.previousLineBrokeCleanly(), m_block.styleRef()));
 
-    skipLeadingWhitespace(resolver, lineInfo, lastFloatFromPreviousLine, width);
+    skipLeadingWhitespace(resolver, lineInfo, width);
 
     if (resolver.position().atEnd())
         return resolver.position();
 
-    BreakingContext context(resolver, lineInfo, width, layoutTextInfo, lastFloatFromPreviousLine, appliedStartWidth, m_block);
+    BreakingContext context(resolver, lineInfo, width, layoutTextInfo, appliedStartWidth, m_block);
 
     while (context.currentItem()) {
         context.initializeForCurrentObject();
         if (context.currentItem().isBR()) {
             context.handleBR(m_clear);
         } else if (context.currentItem().isOutOfFlowPositioned()) {
             context.handleOutOfFlowPositioned(m_positionedObjects);
         } else if (context.currentItem().isFloating()) {
             context.handleFloat();
         } else if (context.currentItem().isLayoutInline()) {
@@ skipping 19 matching lines @@
 
         context.increment();
     }
 
     context.clearLineBreakIfFitsOnLine();
 
     return context.handleEndOfLine();
 }
 
 } // namespace blink