Percent height border-box content should get correct height in percent height cells

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 1093 matching lines @@
 
   int remainingExtraLogicalHeight = extraLogicalHeight;
   distributeExtraLogicalHeightToPercentRows(remainingExtraLogicalHeight,
                                             totalPercent);
   distributeExtraLogicalHeightToAutoRows(remainingExtraLogicalHeight,
                                          autoRowsCount);
   distributeRemainingExtraLogicalHeight(remainingExtraLogicalHeight);
   return extraLogicalHeight - remainingExtraLogicalHeight;
 }
 
-static bool shouldFlexCellChild(LayoutObject* cellDescendant) {
-  return cellDescendant->isAtomicInlineLevel() ||
-         (cellDescendant->isBox() &&
-          toLayoutBox(cellDescendant)->style()->overflowY() !=
-              OverflowVisible &&
-          toLayoutBox(cellDescendant)->style()->overflowY() != OverflowHidden);
+static bool shouldFlexCellChild(const LayoutTableCell& cell,
+                                LayoutObject* cellDescendant) {
+  if (!cell.style()->logicalHeight().isSpecified())
+    return false;
+  if (cellDescendant->isAtomicInlineLevel())
+    return true;
+  if (cellDescendant->style()->overflowY() == OverflowVisible ||
+      cellDescendant->style()->overflowY() == OverflowHidden)
+    return true;
+  Node* node = cellDescendant->node();
+  return node && node->isElementNode() &&
+         (toElement(node)->isFormControlElement() ||
+          isHTMLImageElement(toElement(node)));
 }
 
 void LayoutTableSection::layoutRows() {
 #if DCHECK_IS_ON()
   SetLayoutNeededForbiddenScope layoutForbiddenScope(*this);
 #endif
 
   ASSERT(!needsLayout());
 
   LayoutAnalyzer::Scope analyzer(*this);
@@ skipping 765 matching lines @@
   // can't hope to match the behavior perfectly, but we'll continue to refine it
   // as we discover new bugs. :)
   bool cellChildrenFlex = false;
   bool flexAllChildren = cell.style()->logicalHeight().isSpecified() ||
                          (!table()->style()->logicalHeight().isAuto() &&
                           rowHeight != cell.logicalHeight());
 
   for (LayoutObject* child = cell.firstChild(); child;
        child = child->nextSibling()) {
     if (!child->isText() && child->style()->logicalHeight().isPercentOrCalc() &&
-        (flexAllChildren || shouldFlexCellChild(child)) &&
+        (flexAllChildren || shouldFlexCellChild(cell, child)) &&
         (!child->isTable() || toLayoutTable(child)->hasSections())) {
       cellChildrenFlex = true;
       break;
     }
   }
 
   if (!cellChildrenFlex) {
     if (TrackedLayoutBoxListHashSet* percentHeightDescendants =
             cell.percentHeightDescendants()) {
       for (auto* descendant : *percentHeightDescendants) {
-        if (flexAllChildren || shouldFlexCellChild(descendant)) {
+        if (flexAllChildren || shouldFlexCellChild(cell, descendant)) {
           cellChildrenFlex = true;
           break;
         }
       }
     }
   }
 
   if (!cellChildrenFlex)
     return;
 
@@ skipping 155 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