Cope with intrinsic height styled on table cells

Source/core/layout/LayoutTableCell.h

 /*
  * 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, 2009, 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 82 matching lines @@
     Length styleOrColLogicalWidth() const
     {
         Length styleWidth = style()->logicalWidth();
         if (!styleWidth.isAuto())
             return styleWidth;
         if (LayoutTableCol* firstColumn = table()->colElement(col()))
             return logicalWidthFromColumns(firstColumn, styleWidth);
         return styleWidth;
     }
 
-    int logicalHeightFromStyle() const
+    LayoutUnit logicalHeightFromStyle() const

[mstensho (USE GERRIT), 2015/07/12 19:38:55]

Why change the return type here? The table code seems to be in love with ints,
so I see no reason not to be consistent. Did you do this because of my remark
about using "LayoutUnit()" instead of "0"? Or was it to avoid an explicit
"toInt()" on the result from valueForLength(), to give the last two ternary
operands the same type?

[rhogan, 2015/07/13 18:28:21]

One of the two callers, LayoutTableCell::cellBaselinePosition,  uses it as a
LayoutUnit so my intention is to save the unnecessary cast in that case, and
defer it in the other.

I'm assuming that max(logicalHeightFromStyle() - computedCSSPaddingAfter() -
borderAfter(), borderBefore() + paddingBefore()) knows the two callers are
LayoutUnits but maybe they need to be max<LayoutUnit>()?

[mstensho (USE GERRIT), 2015/07/14 08:45:29]

I don't know how that type soup is resolved, but how about changing it back to
int for now, since changing to LayoutUnit isn't relevant for your fix, and since
most other parts of the table code use ints?

     {
-        int styleLogicalHeight = valueForLength(style()->logicalHeight(), 0);
+        Length height = style()->logicalHeight();
+        LayoutUnit styleLogicalHeight = height.isIntrinsic() ? LayoutUnit() : valueForLength(height, LayoutUnit());
+
         // In strict mode, box-sizing: content-box do the right thing and actually add in the border and padding.
         // Call computedCSSPadding* directly to avoid including implicitPadding.
         if (!document().inQuirksMode() && style()->boxSizing() != BORDER_BOX)
             styleLogicalHeight += (computedCSSPaddingBefore() + computedCSSPaddingAfter()).floor() + borderBefore() + borderAfter();
         return styleLogicalHeight;
     }
 
     int logicalHeightForRowSizing() const
     {
         // FIXME: This function does too much work, and is very hot during table layout!
@@ skipping 193 matching lines @@
 
 inline LayoutTableCell* LayoutTableRow::lastCell() const
 {
     ASSERT(children() == virtualChildren());
     return toLayoutTableCell(children()->lastChild());
 }
 
 } // namespace blink
 
 #endif // LayoutTableCell_h