Let positionNewFloats() take a logicalTop parameter.

third_party/WebKit/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 1344 matching lines @@
           delta -= line->paginationStrut();
           adjustLinePositionForPagination(*line, delta);
         }
         if (delta)
           line->moveInBlockDirection(delta);
         if (Vector<LayoutBox*>* cleanLineFloats = line->floatsPtr()) {
           for (auto* box : *cleanLineFloats) {
             FloatingObject* floatingObject = insertFloatingObject(*box);
             ASSERT(!floatingObject->originatingLine());
             floatingObject->setOriginatingLine(line);
-            setLogicalHeight(logicalTopForChild(*box) -
-                             marginBeforeForChild(*box) + delta);
-            positionNewFloats();
+            LayoutUnit logicalTop =
+                logicalTopForChild(*box) - marginBeforeForChild(*box) + delta;
+            positionNewFloats(logicalTop);
           }
         }
       }
       setLogicalHeight(lastRootBox()->lineBottomWithLeading());
     } else {
       // Delete all the remaining lines.
       deleteLineRange(layoutState, layoutState.endLine());
     }
   }
 
   // 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())
+  if (positionNewFloats(logicalHeight()) && lastRootBox())
     appendFloatsToLastLine(layoutState, InlineIterator(), InlineBidiResolver(),
                            BidiStatus());
 }
 
 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;
     if (!floats[i].everHadLayout) {
       if (!f->location().x() && !f->location().y())
         f->setShouldDoFullPaintInvalidation();
     }
     insertFloatingObject(*f);
   }
-  positionNewFloats();
+  positionNewFloats(logicalHeight());
 }
 
 // InlineMinMaxIterator is a class that will iterate over all layout objects
 // that contribute to inline min/max width calculations. Note the following
 // about the way it walks:
 // (1) Positioned content is skipped (since it does not contribute to min/max
 //     width of a block)
 // (2) We do not drill into the children of floats or replaced elements, since
 //     you can't break in the middle of such an element.
 // (3) Inline flows (e.g., <a>, <span>, <i>) are walked twice, since each side
@@ skipping 659 matching lines @@
       if (lastRootBox() && !lastRootBox()->endsWithBreak())
         curr = lastRootBox();
     }
 
     // If we have no dirty lines, then last is just the last root box.
     last = curr ? curr->prevRootBox() : lastRootBox();
   }
 
   unsigned numCleanFloats = 0;
   if (!layoutState.floats().isEmpty()) {
-    LayoutUnit savedLogicalHeight = logicalHeight();
     // Restore floats from clean lines.
     RootInlineBox* line = firstRootBox();
     while (line != curr) {
       if (Vector<LayoutBox*>* cleanLineFloats = line->floatsPtr()) {
         for (auto* box : *cleanLineFloats) {
           FloatingObject* floatingObject = insertFloatingObject(*box);
           ASSERT(!floatingObject->originatingLine());
           floatingObject->setOriginatingLine(line);
-          setLogicalHeight(logicalTopForChild(*box) -
-                           marginBeforeForChild(*box));
-          positionNewFloats();
+          LayoutUnit logicalTop =
+              logicalTopForChild(*box) - marginBeforeForChild(*box);
+          positionNewFloats(logicalTop);
           ASSERT(layoutState.floats()[numCleanFloats].object == box);
           numCleanFloats++;
         }
       }
       line = line->nextRootBox();
     }
-    setLogicalHeight(savedLogicalHeight);
   }
   layoutState.setFloatIndex(numCleanFloats);
 
   layoutState.lineInfo().setFirstLine(!last);
   layoutState.lineInfo().setPreviousLineBrokeCleanly(!last ||
                                                      last->endsWithBreak());
 
   if (last) {
     setLogicalHeight(last->lineBottomWithLeading());
     InlineIterator iter = InlineIterator(LineLayoutBlockFlow(this),
@@ skipping 403 matching lines @@
 
 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const {
   // LayoutBlockFlow is in charge of paint invalidation of the first line.
   if (firstLineBox())
     return false;
 
   return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize();
 }
 
 }  // namespace blink