Changeset 249297 in webkit

Timestamp:

Aug 29, 2019 3:32:43 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Initialize <tr> display boxes.
​https://bugs.webkit.org/show_bug.cgi?id=201232
<rdar://problem/54806789>

Reviewed by Antti Koivisto.

Set them as blank for now.

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::initializeDisplayBoxToBlank const):
(WebCore::Layout::TableFormattingContext::layout const):

• layout/tableformatting/TableFormattingContext.h:
• layout/tableformatting/TableGrid.cpp:

(WebCore::Layout::TableGrid::Row::Row):
(WebCore::Layout::TableGrid::appendCell):

• layout/tableformatting/TableGrid.h:

(WebCore::Layout::TableGrid::Row::box const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-29  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Initialize <tr> display boxes.
+        https://bugs.webkit.org/show_bug.cgi?id=201232
+        <rdar://problem/54806789>
+
+        Reviewed by Antti Koivisto.
+
+        Set them as blank for now.
+
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::initializeDisplayBoxToBlank const):
+        (WebCore::Layout::TableFormattingContext::layout const):
+        * layout/tableformatting/TableFormattingContext.h:
+        * layout/tableformatting/TableGrid.cpp:
+        (WebCore::Layout::TableGrid::Row::Row):
+        (WebCore::Layout::TableGrid::appendCell):
+        * layout/tableformatting/TableGrid.h:
+        (WebCore::Layout::TableGrid::Row::box const):
+
 2019-08-29  Youenn Fablet  <youenn@apple.com>
 

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

@@ -30 +30 @@
 
 #include "LayoutBox.h"
+#include "LayoutChildIterator.h"
 #include "TableFormattingState.h"
 #include <wtf/IsoMallocInlines.h>
@@ -37 +38 @@
 
 WTF_MAKE_ISO_ALLOCATED_IMPL(TableFormattingContext);
+
+// FIXME: This is temporary. Remove this function when table formatting is complete.
+void TableFormattingContext::initializeDisplayBoxToBlank(Display::Box& displayBox) const
+{
+    displayBox.setBorder({ });
+    displayBox.setPadding({ });
+    displayBox.setHorizontalMargin({ });
+    displayBox.setHorizontalComputedMargin({ });
+    displayBox.setVerticalMargin({ { }, { } });
+    displayBox.setTopLeft({ });
+    displayBox.setContentBoxWidth({ });
+    displayBox.setContentBoxHeight({ });
+}
 
 // https://www.w3.org/TR/css-tables-3/#table-layout-algorithm
@@ -53 +67 @@
     auto& columnList = grid.columnsContext().columns();
     auto& rowList = grid.rows();
+    // First row.
+    auto& row = rowList.first();
+    row.setLogicalTop({ });
+    initializeDisplayBoxToBlank(layoutState.displayBoxForLayoutBox(row.box()));
+
     for (auto& cell : cellList) {
         auto& cellLayoutBox = cell->tableCellBox;
@@ -62 +81 @@
         auto& row = rowList.at(cellPosition.y());
         auto& column = columnList.at(cellPosition.x());
+
+        initializeDisplayBoxToBlank(cellDisplayBox);
         cellDisplayBox.setContentBoxWidth(column.logicalWidth());
-        // FIXME: Do not use blanks.
-        cellDisplayBox.setBorder({ });
-        cellDisplayBox.setPadding({ });
-        cellDisplayBox.setHorizontalMargin({ });
-        cellDisplayBox.setHorizontalComputedMargin({ });
-
         cellDisplayBox.setTopLeft({ column.logicalLeft(), row.logicalTop() });
 
@@ -83 +98 @@
             auto& previousRow = rowList.at(cellPosition.y() - 1);
             row.setLogicalTop(previousRow.logicalBottom());
+            initializeDisplayBoxToBlank(layoutState.displayBoxForLayoutBox(row.box()));
         }
     }

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

@@ -56 +56 @@
     void distributeAvailableWidth(LayoutUnit extraHorizontalSpace) const;
 
+    void initializeDisplayBoxToBlank(Display::Box&) const;
+
     TableFormattingState& formattingState() const { return downcast<TableFormattingState>(FormattingContext::formattingState()); }
 };

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

@@ -89 +89 @@
 }
 
+TableGrid::Row::Row(const Box& rowBox)
+    : m_layoutBox(rowBox)
+{
+}
+
 TableGrid::CellInfo::CellInfo(const Box& tableCellBox, SlotPosition position, CellSize size)
     : tableCellBox(tableCellBox)
@@ -148 +153 @@
 
     if (isInNewRow)
-        m_rows.append({ });
+        m_rows.append({ *tableCellBox.parent() });
 
     m_cellList.add(WTFMove(cellInfo));

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

@@ -110 +110 @@
     struct Row {
     public:
+        Row(const Box&);
+
+        const Box& box() const { return m_layoutBox; }
+
         void setLogicalTop(LayoutUnit logicalTop) { m_logicalTop = logicalTop; }
         LayoutUnit logicalTop() const { return m_logicalTop; }
@@ -121 +125 @@
         LayoutUnit m_logicalTop;
         LayoutUnit m_logicalHeight;
+        const Box& m_layoutBox;
     };
     using RowList = WTF::Vector<Row>;