Move table row pagination strut insertion to the first layout pass.

third_party/WebKit/Source/core/layout/LayoutTable.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.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
@@ skipping 603 matching lines @@
     setLogicalHeight(tableBoxLogicalTop + borderAndPaddingBefore);
 
     LayoutUnit sectionLogicalLeft = LayoutUnit(
         style()->isLeftToRightDirection() ? borderStart() : borderEnd());
     if (!collapsing) {
       sectionLogicalLeft +=
           style()->isLeftToRightDirection() ? paddingStart() : paddingEnd();
     }
 
     // Lay out table header group.
-    if (LayoutTableSection* section = header())
+    if (LayoutTableSection* section = header()) {
       layoutSection(*section, layouter, sectionLogicalLeft);
+      if (state.isPaginated()) {
+        // If the repeating header group allows at least one row of content,
+        // then store the offset for other sections to offset their rows
+        // against.
+        LayoutUnit sectionLogicalHeight = section->logicalHeight();
+        if (sectionLogicalHeight <
+                section->pageLogicalHeightForOffset(section->logicalTop()) &&
+            section->getPaginationBreakability() != AllowAnyBreaks) {
+          LayoutUnit offsetForTableHeaders =
+              state.heightOffsetForTableHeaders();
+          // Don't include any strut in the header group - we only want the
+          // height from its content.
+          offsetForTableHeaders += sectionLogicalHeight;
+          if (LayoutTableRow* row = section->firstRow())
+            offsetForTableHeaders -= row->paginationStrut();
+          section->setOffsetForRepeatingHeader(
+              state.heightOffsetForTableHeaders());
+          state.setHeightOffsetForTableHeaders(offsetForTableHeaders);
+        }
+      }
+    }
 
     // Lay out table body groups, and column groups.
     for (LayoutObject* child = firstChild(); child;
          child = child->nextSibling()) {
       if (child->isTableSection()) {
         if (child != header() && child != footer()) {
           LayoutTableSection& section = *toLayoutTableSection(child);
           layoutSection(section, layouter, sectionLogicalLeft);
         }
       } else if (child->isLayoutTableCol()) {
@@ skipping 15 matching lines @@
       totalSectionLogicalHeight =
           bottomSection->logicalBottom() - topSection->logicalTop();
     }
 
     if (!state.isPaginated() ||
         !crossesPageBoundary(tableBoxLogicalTop, computedLogicalHeight)) {
       distributeExtraLogicalHeight(
           floorToInt(computedLogicalHeight - totalSectionLogicalHeight));
     }
 
-    bool isPaginated = view()->layoutState()->isPaginated();
     LayoutUnit logicalOffset =
         topSection ? topSection->logicalTop() : LayoutUnit();
     for (LayoutTableSection* section = topSection; section;
          section = sectionBelow(section)) {
       section->setLogicalTop(logicalOffset);
       section->layoutRows();
       logicalOffset += section->logicalHeight();
-      // If the section is a repeating header group that allows at least one row
-      // of content then store the offset for other sections to offset their
-      // rows against.
-      if (isPaginated && m_head && m_head == section &&
-          section->logicalHeight() <
-              section->pageLogicalHeightForOffset(logicalOffset) &&
-          section->getPaginationBreakability() != LayoutBox::AllowAnyBreaks) {
-        LayoutUnit offsetForTableHeaders = state.heightOffsetForTableHeaders();
-        // Don't include any strut in the header group - we only want the height
-        // from its content.
-        offsetForTableHeaders += section->logicalHeight();
-        if (LayoutTableRow* row = section->firstRow())
-          offsetForTableHeaders -= row->paginationStrut();
-        state.setHeightOffsetForTableHeaders(offsetForTableHeaders);
-      }
     }
 
     if (!topSection && computedLogicalHeight > totalSectionLogicalHeight &&
         !document().inQuirksMode()) {
       // Completely empty tables (with no sections or anything) should at least
       // honor specified height in strict mode.
       setLogicalHeight(logicalHeight() + computedLogicalHeight);
     }
 
     // position the table sections
@@ skipping 992 matching lines @@
 }
 
 LayoutUnit LayoutTable::paddingRight() const {
   if (collapseBorders())
     return LayoutUnit();
 
   return LayoutBlock::paddingRight();
 }
 
 }  // namespace blink