Changeset 260708 in webkit

Timestamp:

Apr 25, 2020 12:13:18 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Add vertical-align: baseline support
​https://bugs.webkit.org/show_bug.cgi?id=211024

Reviewed by Antti Koivisto.

Source/WebCore:

Adjust the padding with the baseline offset when the cell is baseline aligned (as opposed to the initial value of 'middle').

Test: fast/layoutformattingcontext/table-basic-row-vertical-align-baseline.html

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):
(WebCore::Layout::TableFormattingContext::computeAndDistributeExtraVerticalSpace):

• layout/tableformatting/TableGrid.h:

(WebCore::Layout::TableGrid::Cell::setBaselineOffset):
(WebCore::Layout::TableGrid::Cell::baselineOffset const):

LayoutTests:

• fast/layoutformattingcontext/table-basic-row-vertical-align-baseline-expected.txt: Added.
• fast/layoutformattingcontext/table-basic-row-vertical-align-baseline.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/table-basic-row-vertical-align-baseline-expected.txt (added)
• LayoutTests/fast/layoutformattingcontext/table-basic-row-vertical-align-baseline.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/tableformatting/TableFormattingContext.cpp (modified) (2 diffs)
• Source/WebCore/layout/tableformatting/TableGrid.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Add vertical-align: baseline support
+        https://bugs.webkit.org/show_bug.cgi?id=211024
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/table-basic-row-vertical-align-baseline-expected.txt: Added.
+        * fast/layoutformattingcontext/table-basic-row-vertical-align-baseline.html: Added.
+
 2020-04-25  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Add vertical-align: baseline support
+        https://bugs.webkit.org/show_bug.cgi?id=211024
+
+        Reviewed by Antti Koivisto.
+
+        Adjust the padding with the baseline offset when the cell is baseline aligned (as opposed to the initial value of 'middle').
+
+        Test: fast/layoutformattingcontext/table-basic-row-vertical-align-baseline.html
+
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):
+        (WebCore::Layout::TableFormattingContext::computeAndDistributeExtraVerticalSpace):
+        * layout/tableformatting/TableGrid.h:
+        (WebCore::Layout::TableGrid::Cell::setBaselineOffset):
+        (WebCore::Layout::TableGrid::Cell::baselineOffset const):
+
 2020-04-25  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp

@@ -69 +69 @@
     // Final table cell layout. At this point all percentage values can be resolved.
     for (auto& cell : grid.cells()) {
-        auto& cellDisplayBox = formattingState().displayBox(cell->box());
+        auto& cellBox = cell->box();
+        auto& cellDisplayBox = formattingState().displayBox(cellBox);
         cellDisplayBox.setTop(rowList[cell->startRow()].logicalTop());
         cellDisplayBox.setLeft(columnList[cell->startColumn()].logicalLeft());
         auto rowHeight = rowList[cell->startRow()].logicalHeight();
         layoutCell(*cell, availableHorizontalSpace, rowHeight);
+        
         // FIXME: Find out if it is ok to use the regular padding here to align the content box inside a tall cell or we need to 
         // use some kind of intrinsic padding similar to RenderTableCell.
-        auto verticalBorder = cellDisplayBox.verticalBorder();
-        auto contentHeight = cellDisplayBox.contentBoxHeight();
-        auto intrinsicVerticalPadding = std::max(0_lu, rowHeight - verticalBorder - contentHeight);
-        // FIXME: Take vertical-align into account here.
-        cellDisplayBox.setVerticalPadding({ intrinsicVerticalPadding / 2, intrinsicVerticalPadding / 2 });
+        auto paddingTop = cellDisplayBox.paddingTop().valueOr(LayoutUnit { });
+        auto paddingBottom = cellDisplayBox.paddingBottom().valueOr(LayoutUnit { });
+        auto intrinsicPaddingTop = LayoutUnit { };
+        auto intrinsicPaddingBottom = LayoutUnit { };
+
+        switch (cellBox.style().verticalAlign()) {
+        case VerticalAlign::Middle: {
+            auto intrinsicVerticalPadding = std::max(0_lu, rowHeight - cellDisplayBox.verticalMarginBorderAndPadding() - cellDisplayBox.contentBoxHeight()); 
+            intrinsicPaddingTop = intrinsicVerticalPadding / 2;
+            intrinsicPaddingBottom = intrinsicVerticalPadding / 2;
+            break;
+        }
+        case VerticalAlign::Baseline: {
+            auto rowBaselineOffset = LayoutUnit { rowList[cell->startRow()].baselineOffset() };
+            auto cellBaselineOffset = LayoutUnit { cell->baselineOffset() };
+            intrinsicPaddingTop = std::max(0_lu, rowBaselineOffset - cellBaselineOffset - cellDisplayBox.borderTop());
+            intrinsicPaddingBottom = std::max(0_lu, rowHeight - cellDisplayBox.verticalMarginBorderAndPadding() - intrinsicPaddingTop - cellDisplayBox.contentBoxHeight());
+            break;
+        }
+        default:
+            ASSERT_NOT_IMPLEMENTED_YET();
+            break;
+        }
+        cellDisplayBox.setVerticalPadding({ paddingTop + intrinsicPaddingTop, paddingBottom + intrinsicPaddingBottom });
     }
 }
@@ -491 +512 @@
             // The minimum height of a row (without spanning-related height distribution) is defined as the height of an hypothetical
             // linebox containing the cells originating in the row.
-            auto& cellBox = slot.cell().box();
-            auto cellBaselineOffset = geometry().usedBaselineForCell(cellBox);
-            maximumColumnAscent = std::max(maximumColumnAscent, cellBaselineOffset);
-            maximumColumnDescent = std::max(maximumColumnDescent, geometryForBox(cellBox).height() - cellBaselineOffset);
+            auto& cell = slot.cell();
+            auto& cellBox = cell.box();
+            cell.setBaselineOffset(geometry().usedBaselineForCell(cellBox));
+            maximumColumnAscent = std::max(maximumColumnAscent, cell.baselineOffset());
+            maximumColumnDescent = std::max(maximumColumnDescent, geometryForBox(cellBox).height() - cell.baselineOffset());
         }
         // <tr style="height: 10px"> is considered as min height.

trunk/Source/WebCore/layout/tableformatting/TableGrid.h

@@ -161 +161 @@
         CellSpan span() const { return m_span; }
 
+        void setBaselineOffset(InlineLayoutUnit baselineOffset) { m_baselineOffset = baselineOffset; }
+        InlineLayoutUnit baselineOffset() const { return m_baselineOffset; }
+
         bool isFixedWidth() const;
 
@@ -169 +172 @@
         SlotPosition m_position;
         CellSpan m_span;
+        InlineLayoutUnit m_baselineOffset;
     };