[orthogonal td] RenderTableCell::logicalHeightForRowSizing should return the logical width of orthogonal content

https://bugs.webkit.org/show_bug.cgi?id=297174

Reviewed by Antti Koivisto.

RenderTableSection::calcRowLogicalHeight walks through the cells and asks for height information
in order to compute the final size of each rows.
RenderTableCell::logicalHeightForRowSizing is supposed to tell how tall the cell is
in the direction of the row. In case of orthogonal content, it's the logical _width_ of the box.

* Source/WebCore/rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::logicalHeightForRowSizing const):
* Source/WebCore/rendering/RenderTableCell.h:
* Source/WebCore/rendering/RenderTableCellInlines.h:
(WebCore::RenderTableCell::logicalHeightForRowSizing const): Deleted.
* Source/WebCore/rendering/RenderTableSection.cpp:
(WebCore::updateLogicalHeightForCell):
(WebCore::RenderTableSection::calcRowLogicalHeight):

Canonical link: https://commits.webkit.org/298559@main

Author: alanbaradlay

Source/WebCore/rendering/RenderTableCell.cpp

@@ -340,6 +340,28 @@ void RenderTableCell::updateLogicalWidth()
         setLogicalWidth(*logicalWidth);
 }
 
+LayoutUnit RenderTableCell::logicalHeightForRowSizing() const
+{
+    auto logicalSizeForRowSizing = [&] {
+        if (!isOrthogonal())
+            return logicalHeight() - (intrinsicPaddingBefore() + intrinsicPaddingAfter());
+        LogicalExtentComputedValues values;
+        computeLogicalWidth(values);
+        return values.m_extent;
+    };
+    // FIXME: This function does too much work, and is very hot during table layout!
+    auto usedLogicalSize = logicalSizeForRowSizing();
+    auto specifiedSize = !isOrthogonal() ? style().logicalHeight() : style().logicalWidth();
+    if (!specifiedSize.isSpecified())
+        return usedLogicalSize;
+    auto computedLogicaSize = Style::evaluate(specifiedSize, 0_lu);
+    // 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() != BoxSizing::BorderBox)
+        computedLogicaSize += computedCSSPaddingBefore() + computedCSSPaddingAfter() + borderBefore() + borderAfter();
+    return std::max(computedLogicaSize, usedLogicalSize);
+}
+
 void RenderTableCell::setCellLogicalWidth(LayoutUnit logicalWidthInTableDirection)
 {
     auto logicalSizeInTableDirection = !isOrthogonal() ? logicalWidth() : logicalHeight();

Source/WebCore/rendering/RenderTableCell.h

@@ -61,7 +61,7 @@ class RenderTableCell final : public RenderBlockFlow {
     RenderTable* table() const;
     unsigned rowIndex() const;
     inline Style::PreferredSize styleOrColLogicalWidth() const;
-    inline LayoutUnit logicalHeightForRowSizing() const;
+    LayoutUnit logicalHeightForRowSizing() const;
     LayoutUnit minLogicalWidthForColumnSizing();
     LayoutUnit maxLogicalWidthForColumnSizing();
 

Source/WebCore/rendering/RenderTableCellInlines.h

@@ -51,20 +51,6 @@ inline const BorderValue& RenderTableCell::borderAdjoiningTableStart() const
     return style().borderStart(tableWritingMode());
 }
 
-inline LayoutUnit RenderTableCell::logicalHeightForRowSizing() const
-{
-    // FIXME: This function does too much work, and is very hot during table layout!
-    LayoutUnit adjustedLogicalHeight = logicalHeight() - (intrinsicPaddingBefore() + intrinsicPaddingAfter());
-    if (!style().logicalHeight().isSpecified())
-        return adjustedLogicalHeight;
-    LayoutUnit styleLogicalHeight = Style::evaluate(style().logicalHeight(), 0_lu);
-    // 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() != BoxSizing::BorderBox)
-        styleLogicalHeight += computedCSSPaddingBefore() + computedCSSPaddingAfter() + borderBefore() + borderAfter();
-    return std::max(styleLogicalHeight, adjustedLogicalHeight);
-}
-
 inline Style::PreferredSize RenderTableCell::styleOrColLogicalWidth() const
 {
     auto& styleWidth = style().logicalWidth();

Source/WebCore/rendering/RenderTableSection.cpp

@@ -74,7 +74,7 @@ static inline void updateLogicalHeightForCell(RenderTableSection::RowStruct& row
     if (cell->rowSpan() != 1)
         return;
 
-    auto& logicalHeight = cell->style().logicalHeight();
+    auto& logicalHeight = !cell->isOrthogonal() ? cell->style().logicalHeight() : cell->style().logicalWidth();
     if (logicalHeight.isPositive()) {
         if (auto percentageLogicalHeight = logicalHeight.tryPercentage()) {
             if (auto percentageRowLogicalHeight = row.logicalHeight.tryPercentage(); !percentageRowLogicalHeight || percentageRowLogicalHeight->value < percentageLogicalHeight->value)
@@ -292,7 +292,7 @@ LayoutUnit RenderTableSection::calcRowLogicalHeight()
                 // For row spanning cells, |r| is the last row in the span.
                 unsigned cellStartRow = cell->rowIndex();
 
-                if (cell->overridingBorderBoxLogicalHeight()) {
+                if (cell->overridingBorderBoxLogicalHeight() && !cell->isOrthogonal()) {
                     cell->clearIntrinsicPadding();
                     cell->clearOverridingSize();
                     cell->setChildNeedsLayout(MarkOnlyThis);