Changeset 248671 in webkit

Timestamp:

Aug 14, 2019 8:39:23 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Implement TableFormattingContext::computePreferredWidthForColumns
​https://bugs.webkit.org/show_bug.cgi?id=200701
<rdar://problem/54287828>

Reviewed by Antti Koivisto.

Compute cells' min/max width first.

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::computePreferredWidthForColumns const):

• layout/tableformatting/TableGrid.cpp:

(WebCore::Layout::TableGrid::slot):
(WebCore::Layout::TableGrid::appendCell):

• layout/tableformatting/TableGrid.h:

(WebCore::Layout::TableGrid::cells):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/tableformatting/TableFormattingContext.cpp (modified) (1 diff)
• layout/tableformatting/TableGrid.cpp (modified) (2 diffs)
• layout/tableformatting/TableGrid.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-14  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Implement TableFormattingContext::computePreferredWidthForColumns
+        https://bugs.webkit.org/show_bug.cgi?id=200701
+        <rdar://problem/54287828>
+
+        Reviewed by Antti Koivisto.
+
+        Compute cells' min/max width first.
+
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::computePreferredWidthForColumns const):
+        * layout/tableformatting/TableGrid.cpp:
+        (WebCore::Layout::TableGrid::slot):
+        (WebCore::Layout::TableGrid::appendCell):
+        * layout/tableformatting/TableGrid.h:
+        (WebCore::Layout::TableGrid::cells):
+
 2019-08-14  Youenn Fablet  <youenn@apple.com>
 

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

@@ -86 +86 @@
 void TableFormattingContext::computePreferredWidthForColumns() const
 {
+    auto& formattingState = this->formattingState();
+    auto& grid = formattingState.tableGrid();
+
+    // 1. Calculate the minimum content width (MCW) of each cell: the formatted content may span any number of lines but may not overflow the cell box.
+    //    If the specified 'width' (W) of the cell is greater than MCW, W is the minimum cell width. A value of 'auto' means that MCW is the minimum cell width.
+    //    Also, calculate the "maximum" cell width of each cell: formatting the content without breaking lines other than where explicit line breaks occur.
+    for (auto& cell : grid.cells()) {
+        ASSERT(cell->tableCellBox.establishesFormattingContext());
+
+        auto intrinsicWidth = layoutState().createFormattingContext(cell->tableCellBox)->computedIntrinsicWidthConstraints();
+        intrinsicWidth = Geometry::constrainByMinMaxWidth(cell->tableCellBox, intrinsicWidth);
+        formattingState.setIntrinsicWidthConstraints(intrinsicWidth);
+
+        auto columnSpan = cell->size.width();
+        auto slotIntrinsicWidth = FormattingContext::IntrinsicWidthConstraints { intrinsicWidth.minimum / columnSpan, intrinsicWidth.maximum / columnSpan };
+        auto initialPosition = cell->position;
+        for (auto i = 0; i < columnSpan; ++i)
+            grid.slot({ initialPosition.x() + i, initialPosition.y() })->widthConstraints = slotIntrinsicWidth;
+    }
 }
 

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

@@ -52 +52 @@
 }
 
+TableGrid::SlotInfo* TableGrid::slot(SlotPosition position)
+{
+    return m_slotMap.get(position);
+}
+
 void TableGrid::appendCell(const Box& tableCellBox)
 {
@@ -80 +85 @@
             auto position = SlotPosition { initialSlotPosition.x() + row - 1, initialSlotPosition.y() + column - 1 };
             ASSERT(!m_slotMap.contains(position));
-            m_slotMap.add(position, SlotInfo { *cellInfo });
+            m_slotMap.add(position, std::make_unique<SlotInfo>(*cellInfo));
         }
     }

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

@@ -47 +47 @@
     void removeCell(const Box&);
 
-private:
     using SlotPosition = IntPoint;
     using CellSize = IntSize;
-    using SlotLogicalSize = LayoutSize;
-
     struct CellInfo : public CanMakeWeakPtr<CellInfo> {
         CellInfo(const Box& tableCellBox, SlotPosition, CellSize);
@@ -59 +56 @@
         CellSize size;
     };
+    using CellList = WTF::ListHashSet<std::unique_ptr<CellInfo>>;
+    CellList& cells() { return m_cellList; }
 
+    using SlotLogicalSize = LayoutSize;
     struct SlotInfo {
         SlotInfo() = default;
@@ -65 +65 @@
 
         WeakPtr<CellInfo> cell;
+        FormattingContext::IntrinsicWidthConstraints widthConstraints;
         SlotLogicalSize size;
     };
+    SlotInfo* slot(SlotPosition);
 
-    using CellList = WTF::ListHashSet<std::unique_ptr<CellInfo>>;
-    using SlotMap = WTF::HashMap<SlotPosition, SlotInfo>;
+private:
+    using SlotMap = WTF::HashMap<SlotPosition, std::unique_ptr<SlotInfo>>;
     SlotMap m_slotMap;
     CellList m_cellList;