Avoid pathological layout on nested percent height tables

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

Index: third_party/WebKit/Source/core/layout/LayoutTable.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTable.cpp b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
index b0a6337f490370f973cdadea505b036af51ef7b8..80bb882d844af6466454e22cc83f7b55ce2f5fd8 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTable.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
@@ -451,12 +451,13 @@ void LayoutTable::layoutSection(LayoutTableSection& section,
     layouter.setChildNeedsLayout(&section);
   if (!section.needsLayout())
     markChildForPaginationRelayoutIfNeeded(section, layouter);
-  section.layoutIfNeeded();
-  int sectionLogicalHeight = section.calcRowLogicalHeight();
-  section.setLogicalHeight(LayoutUnit(sectionLogicalHeight));
+  if (section.needsLayout()) {
+    section.layout();
+    section.setLogicalHeight(LayoutUnit(section.calcRowLogicalHeight()));
+  }
   if (view()->layoutState()->isPaginated())
     updateFragmentationInfoForChild(section);
-  setLogicalHeight(logicalHeight() + sectionLogicalHeight);
+  setLogicalHeight(logicalHeight() + section.logicalHeight());
 }
 
 LayoutUnit LayoutTable::logicalHeightFromStyle() const {
@@ -501,8 +502,8 @@ void LayoutTable::distributeExtraLogicalHeight(int extraLogicalHeight) {
     extraLogicalHeight -=
         section->distributeExtraLogicalHeightToRows(extraLogicalHeight);
 
-  // FIXME: We really would like to enable this ASSERT to ensure that all the
-  // extra space has been distributed.
+  // crbug.com/690087: We really would like to enable this ASSERT to ensure that
+  // all the extra space has been distributed.
   // However our current distribution algorithm does not round properly and thus
   // we can have some remaining height.
   // ASSERT(!topSection() || !extraLogicalHeight);