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

Source/core/layout/FloatingObjects.h

Index: Source/core/layout/FloatingObjects.h
diff --git a/Source/core/layout/FloatingObjects.h b/Source/core/layout/FloatingObjects.h
index 747e0603ac19a483de09b1d61a1e36d39e71b15a..e09bf7406b8f8ab6ceb1860284d88deed6eb36e2 100644
--- a/Source/core/layout/FloatingObjects.h
+++ b/Source/core/layout/FloatingObjects.h
@@ -35,6 +35,9 @@
 class LayoutBlockFlow;
 class LayoutBox;
 
+// FIXME this should be removed once LayoutBlockFlow::nextFloatLogicalBottomBelow doesn't need it anymore. (Bug 123931)
+enum ShapeOutsideFloatOffsetMode { ShapeOutsideFloatShapeOffset, ShapeOutsideFloatMarginBoxOffset };
+
 class FloatingObject {
     WTF_MAKE_NONCOPYABLE(FloatingObject); WTF_MAKE_FAST_ALLOCATED(FloatingObject);
 public:
@@ -156,8 +159,6 @@
 
     LayoutUnit logicalLeftOffsetForPositioningFloat(LayoutUnit fixedOffset, LayoutUnit logicalTop, LayoutUnit* heightRemaining);
     LayoutUnit logicalRightOffsetForPositioningFloat(LayoutUnit fixedOffset, LayoutUnit logicalTop, LayoutUnit* heightRemaining);
-    LayoutUnit findNextFloatLogicalBottomBelow(LayoutUnit logicalHeight);
-    LayoutUnit findNextFloatLogicalBottomBelowForBlock(LayoutUnit logicalHeight);
 
     LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type);
     FloatingObject* lowestFloatingObject() const;