Fix regression in unwinding overallocation on auto cells

Source/core/layout/TableLayoutAlgorithmAuto.cpp

 /*
  * Copyright (C) 2002 Lars Knoll (knoll@kde.org)
  *           (C) 2002 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2008, 2010 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.
  *
@@ skipping 598 matching lines @@
 
     if (available > 0 && nEffCols > numAutoEmptyCellsOnly) {
         unsigned total = nEffCols - numAutoEmptyCellsOnly;
         // Starting from the last cell is for compatibility with FF/IE - it isn't specified anywhere.
         distributeWidthToColumns<unsigned, Auto, NonEmptyCells, LeftoverWidth, EndToStart>(available, total);
     }
 
     // If we have overallocated, reduce every cell according to the difference between desired width and minwidth
     // this seems to produce to the pixel exact results with IE. Wonder is some of this also holds for width distributing.
     // This is basically the reverse of how we grew the cells.
-    if (available < 0)
-        shrinkColumnWidth(Auto, available);
+    if (available < 0) {
+        int autoWidthAvailable = available - static_cast<int>(totalAuto);
+        shrinkColumnWidth(Auto, autoWidthAvailable);
+    }
     if (available < 0)
         shrinkColumnWidth(Fixed, available);
     if (available < 0)
         shrinkColumnWidth(Percent, available);
 
     int pos = 0;
     for (size_t i = 0; i < nEffCols; ++i) {
         m_table->setColumnPosition(i, pos);
         pos += m_layoutStruct[i].computedLogicalWidth + m_table->hBorderSpacing();
     }
     m_table->setColumnPosition(m_table->columnPositions().size() - 1, pos);
 }
 
 template<typename Total, LengthType lengthType, CellsToProcess cellsToProcess, DistributionMode distributionMode, DistributionDirection distributionDirection>
-void TableLayoutAlgorithmAuto::distributeWidthToColumns(int& available, Total total)
+void TableLayoutAlgorithmAuto::distributeWidthToColumns(int& available, Total& total)
 {
     // TODO(alancutter): Make this work correctly for calc lengths.
     int nEffCols = static_cast<int>(m_table->numEffCols());
     bool startToEnd = distributionDirection == StartToEnd;
     for (int i = startToEnd ? 0 : nEffCols - 1; startToEnd ? i < nEffCols : i > -1; startToEnd ? ++i : --i) {
         const Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
         if (cellsToProcess == NonEmptyCells && logicalWidth.isAuto() && m_layoutStruct[i].emptyCellsOnly)
             continue;
         if (distributionMode != LeftoverWidth && logicalWidth.type() != lengthType)
             continue;
 
         float factor = 1;
         if (distributionMode != LeftoverWidth) {
             if (lengthType == Percent)
                 factor = logicalWidth.percent();
             else if (lengthType == Auto || lengthType == Fixed)
                 factor = m_layoutStruct[i].effectiveMaxLogicalWidth;
         }
 
         int newWidth = available * factor / total;
         int cellLogicalWidth = (distributionMode == InitialWidth) ? max<int>(m_layoutStruct[i].computedLogicalWidth, newWidth) : newWidth;
         available -= cellLogicalWidth;
         total -= factor;
         m_layoutStruct[i].computedLogicalWidth = (distributionMode == InitialWidth) ? cellLogicalWidth : m_layoutStruct[i].computedLogicalWidth + cellLogicalWidth;
 
         // If we have run out of width to allocate we're done.
-        // Also, any overallocation will be unwound later so no point in building up cells to unwind, just bail now.
-        if (available <= 0 || total <= 0)
+        // TODO(rhogan): Extend this to Fixed as well.
+        if ((lengthType == Percent || lengthType == Auto) && (available <= 0 || total <= 0))
             return;
     }
 }
 
 void TableLayoutAlgorithmAuto::shrinkColumnWidth(const LengthType& lengthType, int& available)
 {
     size_t nEffCols = m_table->numEffCols();
     int logicalWidthBeyondMin = 0;
     for (unsigned i = nEffCols; i; ) {
         --i;
@@ skipping 10 matching lines @@
             int reduce = available * minMaxDiff / logicalWidthBeyondMin;
             m_layoutStruct[i].computedLogicalWidth += reduce;
             available -= reduce;
             logicalWidthBeyondMin -= minMaxDiff;
             if (available >= 0)
                 break;
         }
     }
 }
 }