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

third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

Index: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
index 81a80cb589d6341108f29b9597ea76fd70688b32..9587116158547a452e73a9eb30fc015c9738ef28 100644
--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
@@ -52,7 +52,7 @@ const unsigned cMaxLineDepth = 200;
 class BreakingContext {
     STACK_ALLOCATED();
 public:
-    BreakingContext(InlineBidiResolver& resolver, LineInfo& inLineInfo, LineWidth& lineWidth, LayoutTextInfo& inLayoutTextInfo, FloatingObject* inLastFloatFromPreviousLine, bool appliedStartWidth, LineLayoutBlockFlow block)
+    BreakingContext(InlineBidiResolver& resolver, LineInfo& inLineInfo, LineWidth& lineWidth, LayoutTextInfo& inLayoutTextInfo, bool appliedStartWidth, LineLayoutBlockFlow block)
         : m_resolver(resolver)
         , m_current(resolver.position())
         , m_lineBreak(resolver.position())
@@ -63,7 +63,6 @@ public:
         , m_blockStyle(block.style())
         , m_lineInfo(inLineInfo)
         , m_layoutTextInfo(inLayoutTextInfo)
-        , m_lastFloatFromPreviousLine(inLastFloatFromPreviousLine)
         , m_width(lineWidth)
         , m_currWS(NORMAL)
         , m_lastWS(NORMAL)
@@ -136,8 +135,6 @@ private:
 
     LayoutTextInfo& m_layoutTextInfo;
 
-    FloatingObject* m_lastFloatFromPreviousLine;
-
     LineWidth m_width;
 
     EWhiteSpace m_currWS;
@@ -305,7 +302,7 @@ inline void BreakingContext::handleBR(EClear& clear)
         // cleanly. Otherwise the <br> has no effect on whether the line is
         // empty or not.
         if (m_startingNewParagraph)
-            m_lineInfo.setEmpty(false, m_block, &m_width);
+            m_lineInfo.setEmpty(false);
         m_trailingObjects.clear();
         m_lineInfo.setPreviousLineBrokeCleanly(true);
 
@@ -397,7 +394,7 @@ inline void BreakingContext::handleFloat()
     // it after moving to next line (in newLine() func)
     // FIXME: Bug 110372: Properly position multiple stacked floats with non-rectangular shape outside.
     if (m_floatsFitOnLine && m_width.fitsOnLine(m_block.logicalWidthForFloat(*floatingObject).toFloat(), ExcludeWhitespace)) {
-        m_block.positionNewFloatOnLine(*floatingObject, m_lastFloatFromPreviousLine, m_lineInfo, m_width);
+        m_block.positionNewFloats(&m_width);
         if (m_lineBreak.getLineLayoutItem() == m_current.getLineLayoutItem()) {
             ASSERT(!m_lineBreak.offset());
             m_lineBreak.increment();
@@ -444,7 +441,7 @@ inline void BreakingContext::handleEmptyInline()
         // An empty inline that only has line-height, vertical-align or font-metrics will
         // not force linebox creation (and thus affect the height of the line) if the rest of the line is empty.
         if (requiresLineBox)
-            m_lineInfo.setEmpty(false, m_block, &m_width);
+            m_lineInfo.setEmpty(false);
         if (m_ignoringSpaces) {
             // If we are in a run of ignored spaces then ensure we get a linebox if lineboxes are eventually
             // created for the line...
@@ -484,7 +481,7 @@ inline void BreakingContext::handleReplaced()
     if (m_ignoringSpaces)
         m_lineMidpointState.stopIgnoringSpaces(InlineIterator(0, m_current.getLineLayoutItem(), 0));
 
-    m_lineInfo.setEmpty(false, m_block, &m_width);
+    m_lineInfo.setEmpty(false);
     m_ignoringSpaces = false;
     m_currentCharacterIsSpace = false;
     m_trailingObjects.clear();
@@ -717,7 +714,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
         m_currentCharacterIsSpace = c == spaceCharacter || c == tabulationCharacter || (!m_preservesNewline && (c == newlineCharacter));
 
         if (!m_collapseWhiteSpace || !m_currentCharacterIsSpace) {
-            m_lineInfo.setEmpty(false, m_block, &m_width);
+            m_lineInfo.setEmpty(false);
             m_width.setTrailingWhitespaceWidth(0);
         }