Changeset 278279 in webkit

Timestamp:

May 31, 2021, 8:47:28 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Move ensureTableGrid to TableFormattingState
​https://bugs.webkit.org/show_bug.cgi?id=226424

Reviewed by Antti Koivisto.

We can certainly have this much logic in a formatting state class.

• layout/formattingContexts/table/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::ensureTableGrid): Deleted.

• layout/formattingContexts/table/TableFormattingContext.h:
• layout/formattingContexts/table/TableFormattingState.cpp:

(WebCore::Layout::ensureTableGrid):
(WebCore::Layout::TableFormattingState::TableFormattingState):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/table/TableFormattingContext.cpp (modified) (1 diff)
• layout/formattingContexts/table/TableFormattingContext.h (modified) (1 diff)
• layout/formattingContexts/table/TableFormattingState.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-31  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Move ensureTableGrid to TableFormattingState
+        https://bugs.webkit.org/show_bug.cgi?id=226424
+
+        Reviewed by Antti Koivisto.
+
+        We can certainly have this much logic in a formatting state class.
+
+        * layout/formattingContexts/table/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::ensureTableGrid): Deleted.
+        * layout/formattingContexts/table/TableFormattingContext.h:
+        * layout/formattingContexts/table/TableFormattingState.cpp:
+        (WebCore::Layout::ensureTableGrid):
+        (WebCore::Layout::TableFormattingState::TableFormattingState):
+
 2021-05-31  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp

@@ -340 +340 @@
 }
 
-UniqueRef<TableGrid> TableFormattingContext::ensureTableGrid(const ContainerBox& tableBox)
-{
-    auto tableGrid = makeUniqueRef<TableGrid>();
-    auto& tableStyle = tableBox.style();
-    auto shouldApplyBorderSpacing = tableStyle.borderCollapse() == BorderCollapse::Separate;
-    tableGrid->setHorizontalSpacing(LayoutUnit { shouldApplyBorderSpacing ? tableStyle.horizontalBorderSpacing() : 0 });
-    tableGrid->setVerticalSpacing(LayoutUnit { shouldApplyBorderSpacing ? tableStyle.verticalBorderSpacing() : 0 });
-
-    auto* firstChild = tableBox.firstChild();
-    if (!firstChild) {
-        // The rare case of empty table.
-        return tableGrid;
-    }
-
-    const Box* tableCaption = nullptr;
-    const Box* colgroup = nullptr;
-    // Table caption is an optional element; if used, it is always the first child of a <table>.
-    if (firstChild->isTableCaption())
-        tableCaption = firstChild;
-    // The <colgroup> must appear after any optional <caption> element but before any <thead>, <th>, <tbody>, <tfoot> and <tr> element.
-    auto* colgroupCandidate = firstChild;
-    if (tableCaption)
-        colgroupCandidate = tableCaption->nextSibling();
-    if (colgroupCandidate->isTableColumnGroup())
-        colgroup = colgroupCandidate;
-
-    if (colgroup) {
-        auto& columns = tableGrid->columns();
-        for (auto* column = downcast<ContainerBox>(*colgroup).firstChild(); column; column = column->nextSibling()) {
-            ASSERT(column->isTableColumn());
-            auto columnSpanCount = column->columnSpan();
-            ASSERT(columnSpanCount > 0);
-            while (columnSpanCount--)
-                columns.addColumn(downcast<ContainerBox>(*column));
-        }
-    }
-
-    auto* firstSection = colgroup ? colgroup->nextSibling() : tableCaption ? tableCaption->nextSibling() : firstChild;
-    for (auto* section = firstSection; section; section = section->nextSibling()) {
-        ASSERT(section->isTableHeader() || section->isTableBody() || section->isTableFooter());
-        for (auto* row = downcast<ContainerBox>(*section).firstChild(); row; row = row->nextSibling()) {
-            ASSERT(row->isTableRow());
-            for (auto* cell = downcast<ContainerBox>(*row).firstChild(); cell; cell = cell->nextSibling()) {
-                ASSERT(cell->isTableCell());
-                tableGrid->appendCell(downcast<ContainerBox>(*cell));
-            }
-        }
-    }
-    return tableGrid;
-}
-
 IntrinsicWidthConstraints TableFormattingContext::computedPreferredWidthForColumns()
 {

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h

@@ -52 +52 @@
     const TableFormattingGeometry& formattingGeometry() const final { return m_tableFormattingGeometry; }
     const TableFormattingQuirks& formattingQuirks() const final { return m_tableFormattingQuirks; }
-
-    static UniqueRef<TableGrid> ensureTableGrid(const ContainerBox& tableBox);
-
     const TableFormattingState& formattingState() const { return downcast<TableFormattingState>(FormattingContext::formattingState()); }
 

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingState.cpp

@@ -37 +37 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(TableFormattingState);
 
+static UniqueRef<TableGrid> ensureTableGrid(const ContainerBox& tableBox)
+{
+    auto tableGrid = makeUniqueRef<TableGrid>();
+    auto& tableStyle = tableBox.style();
+    auto shouldApplyBorderSpacing = tableStyle.borderCollapse() == BorderCollapse::Separate;
+    tableGrid->setHorizontalSpacing(LayoutUnit { shouldApplyBorderSpacing ? tableStyle.horizontalBorderSpacing() : 0 });
+    tableGrid->setVerticalSpacing(LayoutUnit { shouldApplyBorderSpacing ? tableStyle.verticalBorderSpacing() : 0 });
+
+    auto* firstChild = tableBox.firstChild();
+    if (!firstChild) {
+        // The rare case of empty table.
+        return tableGrid;
+    }
+
+    const Box* tableCaption = nullptr;
+    const Box* colgroup = nullptr;
+    // Table caption is an optional element; if used, it is always the first child of a <table>.
+    if (firstChild->isTableCaption())
+        tableCaption = firstChild;
+    // The <colgroup> must appear after any optional <caption> element but before any <thead>, <th>, <tbody>, <tfoot> and <tr> element.
+    auto* colgroupCandidate = firstChild;
+    if (tableCaption)
+        colgroupCandidate = tableCaption->nextSibling();
+    if (colgroupCandidate->isTableColumnGroup())
+        colgroup = colgroupCandidate;
+
+    if (colgroup) {
+        auto& columns = tableGrid->columns();
+        for (auto* column = downcast<ContainerBox>(*colgroup).firstChild(); column; column = column->nextSibling()) {
+            ASSERT(column->isTableColumn());
+            auto columnSpanCount = column->columnSpan();
+            ASSERT(columnSpanCount > 0);
+            while (columnSpanCount--)
+                columns.addColumn(downcast<ContainerBox>(*column));
+        }
+    }
+
+    auto* firstSection = colgroup ? colgroup->nextSibling() : tableCaption ? tableCaption->nextSibling() : firstChild;
+    for (auto* section = firstSection; section; section = section->nextSibling()) {
+        ASSERT(section->isTableHeader() || section->isTableBody() || section->isTableFooter());
+        for (auto* row = downcast<ContainerBox>(*section).firstChild(); row; row = row->nextSibling()) {
+            ASSERT(row->isTableRow());
+            for (auto* cell = downcast<ContainerBox>(*row).firstChild(); cell; cell = cell->nextSibling()) {
+                ASSERT(cell->isTableCell());
+                tableGrid->appendCell(downcast<ContainerBox>(*cell));
+            }
+        }
+    }
+    return tableGrid;
+}
+
+
 TableFormattingState::TableFormattingState(Ref<FloatingState>&& floatingState, LayoutState& layoutState, const ContainerBox& tableBox)
     : FormattingState(WTFMove(floatingState), Type::Table, layoutState)
-    , m_tableGrid(TableFormattingContext::ensureTableGrid(tableBox))
+    , m_tableGrid(ensureTableGrid(tableBox))
 {
 }