Introduce maxColumnLogicalHeight() and clean up a little.

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

 /*
  * Copyright (C) 2012 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 139 matching lines @@
     // Populate the flow thread with what's currently its siblings. Called when a regular block
     // becomes a multicol container.
     void populate();
 
     // Empty the flow thread by moving everything to the parent. Remove all multicol specific
     // layoutObjects. Then destroy the flow thread. Called when a multicol container becomes a regular
     // block.
     void evacuateAndDestroy();
 
     unsigned columnCount() const { return m_columnCount; }
+
+    // Total height available to columns and spanners. This is the multicol container's content box
+    // logical height, or 0 if auto.
     LayoutUnit columnHeightAvailable() const { return m_columnHeightAvailable; }
     void setColumnHeightAvailable(LayoutUnit available) { m_columnHeightAvailable = available; }
+
+    // Maximum content box logical height for the multicol container. This takes CSS logical
+    // 'height' and 'max-height' into account. LayoutUnit::max() is returned if nothing constrains
+    // the height of the multicol container. This method only deals with used values of CSS
+    // properties, and it does not consider enclosing fragmentation contexts -- that's something
+    // that needs to be calculated per fragmentainer group.
+    LayoutUnit maxColumnLogicalHeight() const;
+
     bool progressionIsInline() const { return m_progressionIsInline; }
 
     LayoutUnit tallestUnbreakableLogicalHeight(LayoutUnit offsetInFlowThread) const;
 
     LayoutSize columnOffset(const LayoutPoint&) const final;
 
     // Do we need to set a new width and lay out?
     virtual bool needsNewWidth() const;
 
     bool isPageLogicalHeightKnown() const final;
@@ skipping 84 matching lines @@
     bool m_isBeingEvacuated;
 };
 
 // Cannot use DEFINE_LAYOUT_OBJECT_TYPE_CASTS here, because isMultiColumnFlowThread() is defined in
 // LayoutFlowThread, not in LayoutObject.
 DEFINE_TYPE_CASTS(LayoutMultiColumnFlowThread, LayoutFlowThread, object, object->isLayoutMultiColumnFlowThread(), object.isLayoutMultiColumnFlowThread());
 
 } // namespace blink
 
 #endif // LayoutMultiColumnFlowThread_h