Table rowspan cell's height resize when percent element present in the cell.

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

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 709 matching lines @@
 
         int cellStartRowBaselineDescent = 0;
         if (cell->rowSpan() == 1) {
             baselineDescent = std::max(baselineDescent, cell->logicalHeightForRowSizing() - baselinePosition);
             cellStartRowBaselineDescent = baselineDescent;
         }
         m_rowPos[row + 1] = std::max<int>(m_rowPos[row + 1], m_rowPos[row] + m_grid[row].baseline + cellStartRowBaselineDescent);
     }
 }
 
+static void ResetOverrideLoicalContentHeightIfNeeded(LayoutTableCell* cell)

[mstensho (USE GERRIT), 2016/01/12 19:18:13]

That wasn't quite what I had in mind. Since updateBaselineForCell() is also
duplicated, I was thinking of something like this:

                         rowSpanCells.append(cell);
                         lastRowSpanCell = cell;
-
-                        // Find out the baseline. The baseline is set on the
first row in a rowSpan.
-                        updateBaselineForCell(cell, r, baselineDescent);
-                    }
-                    continue;
                 }
 
-                ASSERT(cell->rowSpan() == 1);
-
                 if (cell->hasOverrideLogicalContentHeight()) {
                     cell->clearIntrinsicPadding();
                     cell->clearOverrideSize();
                     cell->forceChildLayout();
                 }
 
-                m_rowPos[r + 1] = std::max(m_rowPos[r + 1], m_rowPos[r] +
cell->logicalHeightForRowSizing());
+                if (cell->rowSpan() == 1) {
+                    m_rowPos[r + 1] = std::max(m_rowPos[r + 1], m_rowPos[r] +
cell->logicalHeightForRowSizing());
 
                 // Find out the baseline.
                 updateBaselineForCell(cell, r, baselineDescent);

[a.suchit2, 2016/01/13 05:58:43]

Done.

+{
+    if (cell->hasOverrideLogicalContentHeight()) {
+        cell->clearIntrinsicPadding();
+        cell->clearOverrideSize();
+        cell->forceChildLayout();
+    }
+}
+
 int LayoutTableSection::calcRowLogicalHeight()
 {
 #if ENABLE(ASSERT)
     SetLayoutNeededForbiddenScope layoutForbiddenScope(*this);
 #endif
 
     ASSERT(!needsLayout());
 
     LayoutTableCell* cell;
 
@@ skipping 43 matching lines @@
                     // For row spanning cells, we only handle them for the first row they span. This ensures we take their baseline into account.
                     if (lastRowSpanCell != cell && cell->rowIndex() == r) {
 #if ENABLE(ASSERT)
                         ASSERT(!uniqueCells.contains(cell));
                         uniqueCells.add(cell);
 #endif
 
                         rowSpanCells.append(cell);
                         lastRowSpanCell = cell;
 
+                        ResetOverrideLoicalContentHeightIfNeeded(cell);
+
                         // Find out the baseline. The baseline is set on the first row in a rowSpan.
                         updateBaselineForCell(cell, r, baselineDescent);
                     }
                     continue;
                 }
 
                 ASSERT(cell->rowSpan() == 1);
 
-                if (cell->hasOverrideLogicalContentHeight()) {
-                    cell->clearIntrinsicPadding();
-                    cell->clearOverrideSize();
-                    cell->forceChildLayout();
-                }
+                ResetOverrideLoicalContentHeightIfNeeded(cell);
 
                 m_rowPos[r + 1] = std::max(m_rowPos[r + 1], m_rowPos[r] + cell->logicalHeightForRowSizing());
 
                 // Find out the baseline.
                 updateBaselineForCell(cell, r, baselineDescent);
             }
         }
 
         // Add the border-spacing to our final position.
         m_rowPos[r + 1] += borderSpacingForRow(r);
@@ skipping 855 matching lines @@
     // FIXME: The table's direction should determine our row's direction, not the section's (see bug 96691).
     if (!style()->isLeftToRightDirection())
         cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - table()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + horizontalBorderSpacing);
     else
         cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizontalBorderSpacing);
 
     cell->setLogicalLocation(cellLocation);
 }
 
 } // namespace blink