Use the correct height on cells when calculating row height in paged contexts

third_party/WebKit/Source/core/layout/LayoutTableRow.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, 2007, 2008, 2009, 2010, 2013 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
@@ skipping 158 matching lines @@
 
     // Table rows do not add translation.
     LayoutState state(*this, LayoutSize());
 
     for (LayoutTableCell* cell = firstCell(); cell; cell = cell->nextCell()) {
         SubtreeLayoutScope layouter(*cell);
         if (!cell->needsLayout())
             cell->markForPaginationRelayoutIfNeeded(layouter);
         if (cell->needsLayout())
             cell->layout();
+        // We're laying out each cell here to establish its raw logical height so it can be used to
+        // figure out the row's height and baseline later on in layoutRows(). As part of that we
+        // will layout the cell again if we're in a paginated context and come up with the
+        // correct strut. Any strut we come up with here will depend on the old paged layout and will
+        // give the cell an invalid height that is not useful for figuring out the raw height of the row.
+        if (cell->firstRootBox() && cell->firstRootBox()->paginationStrut())
+            cell->setLogicalHeight(cell->logicalHeight() - cell->firstRootBox()->paginationStrut());
     }
 
     m_overflow.reset();
     addVisualEffectOverflow();
     // We do not call addOverflowFromCell here. The cell are laid out to be
     // measured above and will be sized correctly in a follow-up phase.
 
     // We only ever need to issue paint invalidations if our cells didn't, which means that they didn't need
     // layout, so we know that our bounds didn't change. This code is just making up for
     // the fact that we did not invalidate paints in setStyle() because we had a layout hint.
@@ skipping 71 matching lines @@
     // The cell and the row share the section's coordinate system. However
     // the visual overflow should be determined in the coordinate system of
     // the row, that's why we shift it below.
     LayoutUnit cellOffsetLogicalTopDifference = cell->location().y() - location().y();
     cellVisualOverflowRect.move(LayoutUnit(), cellOffsetLogicalTopDifference);
 
     addContentsVisualOverflow(cellVisualOverflowRect);
 }
 
 } // namespace blink