[New Multicolumn] Intrinsic/preferred logical width calculation for spanners.

Source/core/rendering/RenderMultiColumnFlowThread.cpp

 /*
  * 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 562 matching lines @@
         // If there were no adjacent spanners, it has to mean that there's only one column set,
         // since it's only spanners that may cause creation of multiple sets.
         columnSetToRemove = firstMultiColumnSet();
         ASSERT(columnSetToRemove);
         ASSERT(!columnSetToRemove->nextSiblingMultiColumnSet());
     }
     ASSERT(columnSetToRemove);
     columnSetToRemove->destroy();
 }
 
+void RenderMultiColumnFlowThread::computePreferredLogicalWidths()
+{
+    RenderFlowThread::computePreferredLogicalWidths();
+
+    // The min/max intrinsic widths calculated really tell how much space elements need when
+    // laid out inside the columns. In order to eventually end up with the desired column width,
+    // we need to convert them to values pertaining to the multicol container.
+    RenderBlockFlow* multicolContainer = multiColumnBlockFlow();

[Julien - ping for review, 2015/01/27 11:02:43]

const RenderBlockFlow* (you're not supposed to modify it)

[mstensho (USE GERRIT), 2015/01/27 11:54:42]

Done.

+    const RenderStyle* multicolStyle = multicolContainer->style();
+    int columnCount = multicolStyle->hasAutoColumnCount() ? 1 : multicolStyle->columnCount();
+    LayoutUnit columnWidth;
+    LayoutUnit gapExtra = (columnCount - 1) * multicolContainer->columnGap();
+    if (multicolStyle->hasAutoColumnWidth()) {
+        m_minPreferredLogicalWidth = m_minPreferredLogicalWidth * columnCount + gapExtra;
+    } else {
+        columnWidth = multicolStyle->columnWidth();
+        m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, columnWidth);
+    }
+    // FIXME: If column-count is auto here, we should resolve it to calculate the maximum
+    // intrinsic width, instead of pretending that it's 1. The only way to do that is by
+    // performing a layout pass, but this is not an appropriate time or place for layout. The
+    // good news is that if height is unconstrained and there are no explicit breaks, the
+    // resolved column-count really should be 1.

[Julien - ping for review, 2015/01/27 11:02:43]

In the end, is that really a FIXME? (seems like the rhetoric is that it's bad
but it's fine)

[mstensho (USE GERRIT), 2015/01/27 11:54:41]

Done.

+    m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, columnWidth) * columnCount + gapExtra;
+}
+
 void RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
 {
     // We simply remain at our intrinsic height.
     computedValues.m_extent = logicalHeight;
     computedValues.m_position = logicalTop;
 }
 
 void RenderMultiColumnFlowThread::updateLogicalWidth()
 {
     LayoutUnit columnWidth;
@@ skipping 49 matching lines @@
 }
 
 bool RenderMultiColumnFlowThread::isPageLogicalHeightKnown() const
 {
     if (RenderMultiColumnSet* columnSet = lastMultiColumnSet())
         return columnSet->pageLogicalHeight();
     return false;
 }
 
 }