Revert of Refactor the treatment of shape-outside objects in float overlapping checks

Source/core/layout/api/LineLayoutBlockFlow.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef LineLayoutBlockFlow_h
 #define LineLayoutBlockFlow_h
 
 #include "core/layout/FloatingObjects.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/api/LineLayoutBox.h"
@@ skipping 93 matching lines @@
     bool positionNewFloats(LineWidth* width)
     {
         return toBlockFlow()->positionNewFloats(width);
     }
 
     bool positionNewFloatOnLine(FloatingObject& newFloat, FloatingObject* lastFloatFromPreviousLine, LineInfo& lineInfo, LineWidth& lineWidth)
     {
         return toBlockFlow()->positionNewFloatOnLine(newFloat, lastFloatFromPreviousLine, lineInfo, lineWidth);
     }
 
-    LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit logicalHeight) const
+    LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit logicalHeight, ShapeOutsideFloatOffsetMode offsetMode = ShapeOutsideFloatMarginBoxOffset) const
     {
-        return toBlockFlow()->nextFloatLogicalBottomBelow(logicalHeight);
+        return toBlockFlow()->nextFloatLogicalBottomBelow(logicalHeight, offsetMode);
     }
 
     FloatingObject* lastFloatFromPreviousLine() const
     {
         return toBlockFlow()->lastFloatFromPreviousLine();
     }
 
     LayoutUnit logicalTopForFloat(const FloatingObject& floatingObject) const
     {
         return toBlockFlow()->logicalTopForFloat(floatingObject);
@@ skipping 30 matching lines @@
     }
 
 private:
     LayoutBlockFlow* toBlockFlow() { return toLayoutBlockFlow(layoutObject()); };
     const LayoutBlockFlow* toBlockFlow() const { return toLayoutBlockFlow(layoutObject()); };
 };
 
 } // namespace blink
 
 #endif // LineLayoutBlockFlow_h