Floats on clean lines that are dirtied during layout

Source/core/layout/LayoutBlockFlowLine.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.
  *
@@ skipping 749 matching lines @@
 
 // Before restarting the layout loop with a new logicalHeight, remove all floats that were added and reset the resolver.
 inline const InlineIterator& LayoutBlockFlow::restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogicalHeight, LayoutUnit newLogicalHeight,  FloatingObject* lastFloatFromPreviousLine, InlineBidiResolver& resolver,  const InlineIterator& oldEnd)
 {
     removeFloatingObjectsBelow(lastFloatFromPreviousLine, oldLogicalHeight);
     setLogicalHeight(newLogicalHeight);
     resolver.setPositionIgnoringNestedIsolates(oldEnd);
     return oldEnd;
 }
 
+void LayoutBlockFlow::appendFloatsToLastLine(LineLayoutState& layoutState, const InlineIterator& cleanLineStart)
+{
+    const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
+    FloatingObjectSetIterator it = floatingObjectSet.begin();
+    FloatingObjectSetIterator end = floatingObjectSet.end();
+    if (layoutState.lastFloat()) {
+        FloatingObjectSetIterator lastFloatIterator = floatingObjectSet.find(layoutState.lastFloat());
+        ASSERT(lastFloatIterator != end);
+        ++lastFloatIterator;
+        it = lastFloatIterator;
+    }
+    for (; it != end; ++it) {
+        FloatingObject& floatingObject = *it->get();
+        // If we've reached the start of clean lines any remaining floating children belong to them.
+        if (floatingObject.layoutObject() == cleanLineStart.object() && layoutState.endLine()) {
+            layoutState.setLastFloat(&floatingObject);
+            return;
+        }
+        appendFloatingObjectToLastLine(floatingObject);
+        ASSERT(floatingObject.layoutObject() == layoutState.floats()[layoutState.floatIndex()].object);
+        // If a float's geometry has changed, give up on syncing with clean lines.
+        if (layoutState.floats()[layoutState.floatIndex()].rect != floatingObject.frameRect()) {
+            // Delete all the remaining lines.
+            deleteLineRange(layoutState, layoutState.endLine());
+            layoutState.setEndLine(nullptr);
+        }
+        layoutState.setFloatIndex(layoutState.floatIndex() + 1);
+    }
+    layoutState.setLastFloat(!floatingObjectSet.isEmpty() ? floatingObjectSet.last().get() : 0);
+}
+
 void LayoutBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState,
     InlineBidiResolver& resolver, const InlineIterator& cleanLineStart,
     const BidiStatus& cleanLineBidiStatus)
 {
     const ComputedStyle& styleToUse = styleRef();
     bool paginated = view()->layoutState() && view()->layoutState()->isPaginated();
     LineMidpointState& lineMidpointState = resolver.midpointState();
     InlineIterator endOfLine = resolver.position();
-    bool checkForEndLineMatch = layoutState.endLine();
     LayoutTextInfo layoutTextInfo;
     VerticalPositionCache verticalPositionCache;
 
     LineBreaker lineBreaker(LineLayoutBlockFlow(this));
 
     while (!endOfLine.atEnd()) {
         bool logicalWidthIsAvailable = false;
 
         // FIXME: Is this check necessary before the first iteration or can it be moved to the end?
-        if (checkForEndLineMatch) {
+        if (layoutState.endLine()) {
             layoutState.setEndLineMatched(matchedEndLine(layoutState, resolver, cleanLineStart, cleanLineBidiStatus));
             if (layoutState.endLineMatched()) {
                 resolver.setPosition(InlineIterator(resolver.position().root(), 0, 0), 0);
                 break;
             }
         }
 
         lineMidpointState.reset();
 
         layoutState.lineInfo().setEmpty(true);
@@ skipping 76 matching lines @@
         }
 
         if (!logicalWidthIsAvailable) {
             for (size_t i = 0; i < lineBreaker.positionedObjects().size(); ++i)
                 setStaticPositions(LineLayoutBlockFlow(this), LineLayoutBox(lineBreaker.positionedObjects()[i]));
 
             if (!layoutState.lineInfo().isEmpty())
                 layoutState.lineInfo().setFirstLine(false);
             clearFloats(lineBreaker.clear());
 
-            if (m_floatingObjects && lastRootBox()) {
-                const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
-                FloatingObjectSetIterator it = floatingObjectSet.begin();
-                FloatingObjectSetIterator end = floatingObjectSet.end();
-                if (layoutState.lastFloat()) {
-                    FloatingObjectSetIterator lastFloatIterator = floatingObjectSet.find(layoutState.lastFloat());
-                    ASSERT(lastFloatIterator != end);
-                    ++lastFloatIterator;
-                    it = lastFloatIterator;
-                }
-                for (; it != end; ++it) {
-                    FloatingObject& floatingObject = *it->get();
-                    // If we've reached the start of clean lines any remaining floating children belong to them.
-                    // We don't care about the 'last float' mechanism once we're in clean lines so it's ok to let it get set below.
-                    if (floatingObject.layoutObject() == cleanLineStart.object())
-                        break;
-                    appendFloatingObjectToLastLine(floatingObject);
-                    ASSERT(floatingObject.layoutObject() == layoutState.floats()[layoutState.floatIndex()].object);
-                    // If a float's geometry has changed, give up on syncing with clean lines.
-                    if (layoutState.floats()[layoutState.floatIndex()].rect != floatingObject.frameRect())
-                        checkForEndLineMatch = false;
-                    layoutState.setFloatIndex(layoutState.floatIndex() + 1);
-                }
-                layoutState.setLastFloat(!floatingObjectSet.isEmpty() ? floatingObjectSet.last().get() : 0);
-            }
+            if (m_floatingObjects && lastRootBox())
+                appendFloatsToLastLine(layoutState, cleanLineStart);
         }
 
         lineMidpointState.reset();
         resolver.setPosition(endOfLine, numberOfIsolateAncestors(endOfLine));
     }
 
     // In case we already adjusted the line positions during this layout to avoid widows
     // then we need to ignore the possibility of having a new widows situation.
     // Otherwise, we risk leaving empty containers which is against the block fragmentation principles.
     if (paginated && !style()->hasAutoWidows() && !didBreakAtLineToAvoidWidow()) {
@@ skipping 83 matching lines @@
                     }
                 }
             }
             setLogicalHeight(lastRootBox()->lineBottomWithLeading());
         } else {
             // Delete all the remaining lines.
             deleteLineRange(layoutState, layoutState.endLine());
         }
     }
 
-    if (positionNewFloats() && lastRootBox()) {
-        // In case we have a float on the last line, it might not be positioned up to now.
-        // This has to be done before adding in the bottom border/padding, or the float will
-        // include the padding incorrectly. -dwh
-        const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
-        FloatingObjectSetIterator it = floatingObjectSet.begin();
-        FloatingObjectSetIterator end = floatingObjectSet.end();
-        if (layoutState.lastFloat()) {
-            FloatingObjectSetIterator lastFloatIterator = floatingObjectSet.find(layoutState.lastFloat());
-            ASSERT(lastFloatIterator != end);
-            ++lastFloatIterator;
-            it = lastFloatIterator;
-        }
-        layoutState.setLastFloat(!floatingObjectSet.isEmpty() ? floatingObjectSet.last().get() : 0);
-
-        if (it == end)
-            return;
-
-        for (; it != end; ++it)
-            appendFloatingObjectToLastLine(*it->get());
-    }
+    // In case we have a float on the last line, it might not be positioned up to now.
+    // This has to be done before adding in the bottom border/padding, or the float will
+    // include the padding incorrectly. -dwh
+    if (positionNewFloats() && lastRootBox())
+        appendFloatsToLastLine(layoutState, InlineIterator());
 }
 
 void LayoutBlockFlow::markDirtyFloatsForPaintInvalidation(Vector<FloatWithRect>& floats)
 {
     size_t floatCount = floats.size();
     // Floats that did not have layout did not paint invalidations when we laid them out. They would have
     // painted by now if they had moved, but if they stayed at (0, 0), they still need to be
     // painted.
     for (size_t i = 0; i < floatCount; ++i) {
         LayoutBox* f = floats[i].object;
@@ skipping 995 matching lines @@
     LayoutUnit logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false);
     LayoutUnit availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), false) - logicalLeft;
     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWidth, availableLogicalWidth, 0);
 
     if (!style()->isLeftToRightDirection())
         return logicalWidth() - logicalLeft;
     return logicalLeft;
 }
 
 }