Clean up LayoutTableSection::calcRowLogicalHeight() a bit.

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)
  *
@@ skipping 834 matching lines @@
   m_rowPos.resize(m_grid.size() + 1);
 
   // We ignore the border-spacing on any non-top section as it is already
   // included in the previous section's last row position.
   if (this == table()->topSection())
     m_rowPos[0] = table()->vBorderSpacing();
   else
     m_rowPos[0] = 0;
 
   SpanningLayoutTableCells rowSpanCells;
-#if ENABLE(ASSERT)
-  HashSet<const LayoutTableCell*> uniqueCells;
-#endif
 
   for (unsigned r = 0; r < m_grid.size(); r++) {
     m_grid[r].baseline = -1;
     int baselineDescent = 0;
 
     if (state.isPaginated() && m_grid[r].rowLayoutObject)
       m_rowPos[r] += m_grid[r].rowLayoutObject->paginationStrut().ceil();
 
     if (m_grid[r].logicalHeight.isSpecified()) {
       // Our base size is the biggest logical height from our cells' styles
       // (excluding row spanning cells).
       m_rowPos[r + 1] = std::max(
           m_rowPos[r] +
               minimumValueForLength(m_grid[r].logicalHeight, LayoutUnit())
                   .round(),
           0);
     } else {
       // Non-specified lengths are ignored because the row already accounts for
       // the cells intrinsic logical height.
       m_rowPos[r + 1] = std::max(m_rowPos[r], 0);
     }
 
     Row& row = m_grid[r].row;
     unsigned totalCols = row.size();
-    LayoutTableCell* lastRowSpanCell = nullptr;
 
     for (unsigned c = 0; c < totalCols; c++) {
       CellStruct& current = cellAt(r, c);
+      if (current.inColSpan)
+        continue;
       for (unsigned i = 0; i < current.cells.size(); i++) {
         cell = current.cells[i];
-        if (current.inColSpan && cell->rowSpan() == 1)
+
+        // For row spanning cells, we only handle them for the first row they
+        // span. This ensures we take their baseline into account.
+        if (cell->rowIndex() != r)
           continue;
 
         if (cell->rowSpan() > 1) {
-          // 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;
-          }
+          DCHECK(!rowSpanCells.contains(cell));
+          rowSpanCells.append(cell);
         }
 
-        if (cell->rowIndex() == r && cell->hasOverrideLogicalContentHeight()) {
+        if (cell->hasOverrideLogicalContentHeight()) {
           cell->clearIntrinsicPadding();
           cell->clearOverrideSize();
           cell->forceChildLayout();
         }
 
         if (cell->rowSpan() == 1)
           m_rowPos[r + 1] = std::max(
               m_rowPos[r + 1], m_rowPos[r] + cell->logicalHeightForRowSizing());
 
         // Find out the baseline. The baseline is set on the first row in a
         // rowSpan.
-        if (cell->rowIndex() == r)
-          updateBaselineForCell(cell, r, baselineDescent);
+        updateBaselineForCell(cell, r, baselineDescent);
       }
     }
 
     // Add the border-spacing to our final position.
     m_rowPos[r + 1] += borderSpacingForRow(r);
     m_rowPos[r + 1] = std::max(m_rowPos[r + 1], m_rowPos[r]);
   }
 
   if (!rowSpanCells.isEmpty())
     distributeRowSpanHeightToRows(rowSpanCells);
@@ skipping 1145 matching lines @@
   // the header in all columns.
   // Note that this is in flow thread coordinates, not visual coordinates. The
   // enclosing LayoutFlowThread will convert to visual coordinates.
   if (table()->header() == this && isRepeatingHeaderGroup())
     rect.setHeight(table()->logicalHeight());
   return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rect,
                                                                  flags);
 }
 
 }  // namespace blink