Deduct pagination struts when calculating initial column height.

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

Index: third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
diff --git a/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp b/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
index 524d8c054e26a6efdf186efa713cf896241fc1b5..6bc91d623d2fcb5ddd045acda086f32057dd891b 100644
--- a/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
+++ b/third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
@@ -78,6 +78,9 @@ void ColumnBalancer::traverseSubtree(const LayoutBox& box)
 InitialColumnHeightFinder::InitialColumnHeightFinder(const MultiColumnFragmentainerGroup& group)
     : ColumnBalancer(group)
 {
+    m_struts.resize(group.columnSet().usedColumnCount());
+    for (auto& strut : m_struts)
+        strut = LayoutUnit::max();
     traverse();
     // We have now found each explicit / forced break, and their location. Now we need to figure out
     // how many additional implicit / soft breaks we need and guess where they will occur, in order
@@ -95,8 +98,13 @@ LayoutUnit InitialColumnHeightFinder::initialMinimalBalancedHeight() const
 void InitialColumnHeightFinder::examineBoxAfterEntering(const LayoutBox& box)
 {
     ASSERT(isFirstAfterBreak(flowThreadOffset()) || !box.paginationStrut());
-    if (box.hasForcedBreakBefore())
+    if (box.hasForcedBreakBefore()) {
         addContentRun(flowThreadOffset());
+    } else if (isFirstAfterBreak(flowThreadOffset())) {
+        // This box is first after a soft break.
+        recordStrutBeforeOffset(flowThreadOffset(), box.paginationStrut());
+    }
+
     if (box.hasForcedBreakAfter())
         addContentRun(flowThreadOffset() + box.logicalHeight());
 }
@@ -107,10 +115,41 @@ void InitialColumnHeightFinder::examineBoxBeforeLeaving(const LayoutBox& box)
 
 void InitialColumnHeightFinder::examineLine(const RootInlineBox& line)
 {
+    LayoutUnit lineTop = line.lineTopWithLeading();
+    LayoutUnit lineTopInFlowThread = flowThreadOffset() + lineTop;
+    ASSERT(isFirstAfterBreak(lineTopInFlowThread) || !line.paginationStrut());
+    if (isFirstAfterBreak(lineTopInFlowThread))
+        recordStrutBeforeOffset(lineTopInFlowThread, line.paginationStrut());
+}
+
+void InitialColumnHeightFinder::recordStrutBeforeOffset(LayoutUnit offsetInFlowThread, LayoutUnit strut)
+{
+    const LayoutMultiColumnSet& columnSet = group().columnSet();
+    ASSERT(columnSet.usedColumnCount() >= 1);
+    unsigned columnCount = columnSet.usedColumnCount();
+    ASSERT(m_struts.size() == columnCount);
+    unsigned index = group().columnIndexAtOffset(offsetInFlowThread - strut, MultiColumnFragmentainerGroup::AssumeNewColumns);
+    if (index >= columnCount)
+        return;
+    m_struts[index] = std::min(m_struts[index], strut);
+}
+
+LayoutUnit InitialColumnHeightFinder::spaceUsedByStrutsAt(LayoutUnit offsetInFlowThread) const
+{
+    unsigned stopBeforeColumn = group().columnIndexAtOffset(offsetInFlowThread, MultiColumnFragmentainerGroup::AssumeNewColumns) + 1;
+    stopBeforeColumn = std::min(stopBeforeColumn, group().columnSet().usedColumnCount());
+    ASSERT(stopBeforeColumn <= m_struts.size());
+    LayoutUnit totalStrut;

[leviw_travelin_and_unemployed, 2015/10/30 20:10:50]

totalStrutSpace or something like that?

[mstensho (USE GERRIT), 2015/11/02 09:12:28]

Done.

+    for (unsigned i = 0; i < stopBeforeColumn; i++) {
+        if (m_struts[i] != LayoutUnit::max())
+            totalStrut += m_struts[i];
+    }
+    return totalStrut;
 }
 
 void InitialColumnHeightFinder::addContentRun(LayoutUnit endOffsetInFlowThread)
 {
+    endOffsetInFlowThread -= spaceUsedByStrutsAt(endOffsetInFlowThread);
     if (!m_contentRuns.isEmpty() && endOffsetInFlowThread <= m_contentRuns.last().breakOffset())
         return;
     // Append another item as long as we haven't exceeded used column count. What ends up in the