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

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

Index: third_party/WebKit/Source/core/layout/line/LineBreaker.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp b/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp
index ce3f4928db12be32d2f384590fd0b2acce291cb8..ab8398121595c6bb00b148b4b55be4740142f3c4 100644
--- a/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp
+++ b/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp
@@ -26,8 +26,7 @@
 
 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();
@@ -38,7 +37,8 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
                 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);
     }
@@ -53,8 +53,7 @@ void LineBreaker::reset()
 }
 
 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo& lineInfo,
-    LayoutTextInfo& layoutTextInfo, FloatingObject* lastFloatFromPreviousLine,
-    WordMeasurements& wordMeasurements)
+    LayoutTextInfo& layoutTextInfo, WordMeasurements& wordMeasurements)
 {
     reset();
 
@@ -64,12 +63,12 @@ InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo
 
     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();