Reland of Improve how the column balancer handles top margins on floats.

third_party/WebKit/Source/core/layout/LayoutBox.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2006, 2007 Apple 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 233 matching lines @@
   }
   LayoutUnit logicalBottom() const { return logicalTop() + logicalHeight(); }
   LayoutUnit logicalWidth() const {
     return style()->isHorizontalWritingMode() ? m_frameRect.width()
                                               : m_frameRect.height();
   }
   LayoutUnit logicalHeight() const {
     return style()->isHorizontalWritingMode() ? m_frameRect.height()
                                               : m_frameRect.width();
   }
-  LayoutUnit logicalHeightIncludingOverflow() const;
+
+  // Logical height of the object, including content overflowing the
+  // border-after edge.
+  LayoutUnit logicalHeightWithVisibleOverflow() const;
 
   LayoutUnit constrainLogicalWidthByMinMax(LayoutUnit,
                                            LayoutUnit,
                                            LayoutBlock*) const;
   LayoutUnit constrainLogicalHeightByMinMax(
       LayoutUnit logicalHeight,
       LayoutUnit intrinsicContentHeight) const;
   LayoutUnit constrainContentBoxLogicalHeightByMinMax(
       LayoutUnit logicalHeight,
       LayoutUnit intrinsicContentHeight) const;
@@ skipping 1354 matching lines @@
 
 inline bool LayoutBox::isForcedFragmentainerBreakValue(EBreak breakValue) {
   return breakValue == BreakColumn || breakValue == BreakLeft ||
          breakValue == BreakPage || breakValue == BreakRecto ||
          breakValue == BreakRight || breakValue == BreakVerso;
 }
 
 }  // namespace blink
 
 #endif  // LayoutBox_h