Remove last-minute row height stretching for pagination.

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 1125 matching lines @@
           rowLogicalHeight -= nextRowObject->paginationStrut();
       }
       rowLayoutObject->setLogicalHeight(rowLogicalHeight);
       rowLayoutObject->updateLayerTransformAfterLayout();
     }
   }
 
   // Vertically align and flex the cells in each row.
   for (unsigned r = 0; r < totalRows; r++) {
     LayoutTableRow* rowLayoutObject = m_grid[r].rowLayoutObject;
-    int rowHeightIncreaseForPagination = INT_MIN;
 
     for (unsigned c = 0; c < nEffCols; c++) {
       CellStruct& cs = cellAt(r, c);
       LayoutTableCell* cell = cs.primaryCell();
 
       if (!cell || cs.inColSpan)
         continue;
 
       if (cell->rowIndex() != r)
         continue;  // Rowspanned cells are handled in the first row they occur.
@@ skipping 30 matching lines @@
 
       LayoutRect oldCellRect = cell->frameRect();
 
       setLogicalPositionForCell(cell, c);
 
       if (!cell->needsLayout())
         markChildForPaginationRelayoutIfNeeded(*cell, layouter);
 
       cell->layoutIfNeeded();
 
-      // FIXME: Make pagination work with vertical tables.
-      if (view()->layoutState()->pageLogicalHeight() &&
-          cell->logicalHeight() != rHeight) {
-        // FIXME: Pagination might have made us change size. For now just shrink
-        // or grow the cell to fit without doing a relayout.
-        // We'll also do a basic increase of the row height to accommodate the
-        // cell if it's bigger, but this isn't quite right either. It's at least
-        // stable though and won't result in an infinite # of relayouts that may
-        // never stabilize.
-        LayoutUnit oldLogicalHeight = cell->logicalHeight();
-        rowHeightIncreaseForPagination =
-            std::max<int>(rowHeightIncreaseForPagination,
-                          (oldLogicalHeight - rHeight).toInt());
-        cell->setLogicalHeight(LayoutUnit(rHeight));
-        cell->computeOverflow(oldLogicalHeight, false);
-      }
-
       LayoutSize childOffset(cell->location() - oldCellRect.location());
       if (childOffset.width() || childOffset.height()) {
         // If the child moved, we have to issue paint invalidations to it as
         // well as any floating/positioned descendants. An exception is if we
         // need a layout. In this case, we know we're going to issue paint
         // invalidations ourselves (and the child) anyway.
         if (!table()->selfNeedsLayout())
           cell->setMayNeedPaintInvalidation();
       }
     }
-    if (rowHeightIncreaseForPagination > INT_MIN) {
-      for (unsigned rowIndex = r + 1; rowIndex <= totalRows; rowIndex++)
-        m_rowPos[rowIndex] += rowHeightIncreaseForPagination;
-      for (unsigned c = 0; c < nEffCols; ++c) {
-        Vector<LayoutTableCell*, 1>& cells = cellAt(r, c).cells;
-        for (size_t i = 0; i < cells.size(); ++i) {
-          LayoutUnit oldLogicalHeight = cells[i]->logicalHeight();
-          cells[i]->setLogicalHeight(oldLogicalHeight +
-                                     rowHeightIncreaseForPagination);
-          cells[i]->computeOverflow(oldLogicalHeight, false);
-        }
-      }
-    }
     if (rowLayoutObject)
       rowLayoutObject->computeOverflow();
   }
 
   ASSERT(!needsLayout());
 
   setLogicalHeight(LayoutUnit(m_rowPos[totalRows]));
 
   computeOverflowFromCells(totalRows, nEffCols);
 }
@@ skipping 827 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