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

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

Index: third_party/WebKit/Source/core/layout/ColumnBalancer.h
diff --git a/third_party/WebKit/Source/core/layout/ColumnBalancer.h b/third_party/WebKit/Source/core/layout/ColumnBalancer.h
index 874941f09701d9e7819f14cc6288191c72513942..e9e724f499a7f5be31e357835019d6626eb63089 100644
--- a/third_party/WebKit/Source/core/layout/ColumnBalancer.h
+++ b/third_party/WebKit/Source/core/layout/ColumnBalancer.h
@@ -73,8 +73,10 @@
   // right after entering and before traversing the subtree of the box, and the
   // second one right after having traversed the subtree.
   virtual void examineBoxAfterEntering(const LayoutBox&,
+                                       LayoutUnit childLogicalHeight,
                                        EBreak previousBreakAfterValue) = 0;
-  virtual void examineBoxBeforeLeaving(const LayoutBox&) = 0;
+  virtual void examineBoxBeforeLeaving(const LayoutBox&,
+                                       LayoutUnit childLogicalHeight) = 0;
 
   // Examine and collect column balancing data from a line that has been found
   // to intersect with the flow thread portion. Does not recurse into layout
@@ -129,8 +131,9 @@
 
  private:
   void examineBoxAfterEntering(const LayoutBox&,
+                               LayoutUnit childLogicalHeight,
                                EBreak previousBreakAfterValue);
-  void examineBoxBeforeLeaving(const LayoutBox&);
+  void examineBoxBeforeLeaving(const LayoutBox&, LayoutUnit childLogicalHeight);
   void examineLine(const RootInlineBox&);
 
   // Record that there's a pagination strut that ends at the specified
@@ -223,8 +226,9 @@
 
  private:
   void examineBoxAfterEntering(const LayoutBox&,
+                               LayoutUnit childLogicalHeight,
                                EBreak previousBreakAfterValue);
-  void examineBoxBeforeLeaving(const LayoutBox&);
+  void examineBoxBeforeLeaving(const LayoutBox&, LayoutUnit childLogicalHeight);
   void examineLine(const RootInlineBox&);
 
   void recordSpaceShortage(LayoutUnit shortage) {