Set the inline position of floats a bit later.

third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3644 matching lines @@
 }
 
 LayoutUnit LayoutBlockFlow::positionAndLayoutFloat(
     FloatingObject& floatingObject,
     LayoutUnit logicalTopMarginEdge) {
   LayoutBox& child = *floatingObject.layoutObject();
 
   // FIXME Investigate if this can be removed. crbug.com/370006
   child.setMayNeedPaintInvalidation();
 
-  LayoutUnit childLogicalLeftMargin = style()->isLeftToRightDirection()
-                                          ? marginStartForChild(child)
-                                          : marginEndForChild(child);
   logicalTopMarginEdge = std::max(
       logicalTopMarginEdge, lowestFloatLogicalBottom(child.style()->clear()));
 
   bool isPaginated = view()->layoutState()->isPaginated();
   if (isPaginated && !childrenInline()) {
     // Forced breaks are inserted at class A break points. Floats may be
     // affected by a break-after value on the previous in-flow sibling.
     if (LayoutBox* previousInFlowBox = child.previousInFlowSiblingBox()) {
       logicalTopMarginEdge = applyForcedBreak(logicalTopMarginEdge,
                                               previousInFlowBox->breakAfter());
     }
   }
 
+  LayoutUnit marginBefore = marginBeforeForChild(child);
+  LayoutUnit marginAfter = marginAfterForChild(child);
   LayoutPoint floatLogicalLocation =
       computeLogicalLocationForFloat(floatingObject, logicalTopMarginEdge);
   logicalTopMarginEdge = floatLogicalLocation.y();
 
-  setLogicalLeftForFloat(floatingObject, floatLogicalLocation.x());
-
-  setLogicalLeftForChild(child,
-                         floatLogicalLocation.x() + childLogicalLeftMargin);
-  setLogicalTopForChild(child,
-                        logicalTopMarginEdge + marginBeforeForChild(child));
+  setLogicalTopForChild(child, logicalTopMarginEdge + marginBefore);
 
   SubtreeLayoutScope layoutScope(child);
   if (!child.needsLayout())
     markChildForPaginationRelayoutIfNeeded(child, layoutScope);
 
   child.layoutIfNeeded();
 
   if (isPaginated) {
     LayoutUnit newLogicalTopMarginEdge =
         adjustFloatLogicalTopForPagination(child, logicalTopMarginEdge);
     if (logicalTopMarginEdge != newLogicalTopMarginEdge) {
       floatLogicalLocation = computeLogicalLocationForFloat(
           floatingObject, newLogicalTopMarginEdge);
       logicalTopMarginEdge = floatLogicalLocation.y();
-      setLogicalLeftForFloat(floatingObject, floatLogicalLocation.x());
-
-      setLogicalLeftForChild(child,
-                             floatLogicalLocation.x() + childLogicalLeftMargin);
-      setLogicalTopForChild(child,
-                            logicalTopMarginEdge + marginBeforeForChild(child));
+      setLogicalTopForChild(child, logicalTopMarginEdge + marginBefore);
 
       if (child.isLayoutBlock())
         child.setChildNeedsLayout(MarkOnlyThis);
       child.layoutIfNeeded();
     }
   }
 
+  LayoutUnit childLogicalLeftMargin = style()->isLeftToRightDirection()
+                                          ? marginStartForChild(child)
+                                          : marginEndForChild(child);
+  setLogicalLeftForChild(child,
+                         floatLogicalLocation.x() + childLogicalLeftMargin);
+  setLogicalLeftForFloat(floatingObject, floatLogicalLocation.x());
   setLogicalTopForFloat(floatingObject, logicalTopMarginEdge);
-
   setLogicalHeightForFloat(floatingObject, logicalHeightForChild(child) +
-                                               marginBeforeForChild(child) +
-                                               marginAfterForChild(child));
+                                               marginBefore + marginAfter);
 
   if (ShapeOutsideInfo* shapeOutside = child.shapeOutsideInfo())
     shapeOutside->setReferenceBoxLogicalSize(logicalSizeForChild(child));
 
   return logicalTopMarginEdge;
 }
 
 bool LayoutBlockFlow::hasOverhangingFloat(LayoutBox* layoutBox) {
   if (!m_floatingObjects || !parent())
     return false;
@@ skipping 812 matching lines @@
   return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 void LayoutBlockFlow::invalidateDisplayItemClients(
     PaintInvalidationReason invalidationReason) const {
   BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
       invalidationReason);
 }
 
 }  // namespace blink