Changeset 279306 in webkit

Timestamp:

Jun 25, 2021, 7:26:41 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Remove redundant struct ResolvedItem
​https://bugs.webkit.org/show_bug.cgi?id=227405

Reviewed by Sam Weinig.

• layout/formattingContexts/table/TableLayout.cpp:

(WebCore::Layout::distributeAvailableSpace):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/table/TableLayout.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-25  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Remove redundant struct ResolvedItem
+        https://bugs.webkit.org/show_bug.cgi?id=227405
+
+        Reviewed by Sam Weinig.
+
+        * layout/formattingContexts/table/TableLayout.cpp:
+        (WebCore::Layout::distributeAvailableSpace):
+
 2021-06-25  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -114 +114 @@
 static Vector<LayoutUnit> distributeAvailableSpace(const TableGrid& grid, LayoutUnit availableSpace, const WTF::Function<GridSpace(const TableGrid::Slot&, size_t)>& slotSpace)
 {
-    struct ResolvedItem {
-        GridSpace slotSpace;
-    };
-
     auto& columns = grid.columns();
     auto& rows = grid.rows();
     // 1. Collect the non-spanning spaces first. They are used for the final distribution as well as for distributing the spanning space.
-    Vector<std::optional<ResolvedItem>> resolvedItems(SpanType::size(grid));
+    Vector<std::optional<GridSpace>> resolvedItems(SpanType::size(grid));
     for (size_t columnIndex = 0; columnIndex < columns.size(); ++columnIndex) {
         for (size_t rowIndex = 0; rowIndex < rows.size(); ++rowIndex) {
@@ -129 +125 @@
             auto index = SpanType::index(columnIndex, rowIndex);
             if (!resolvedItems[index])
-                resolvedItems[index] = ResolvedItem { };
-            resolvedItems[index]->slotSpace = max(resolvedItems[index]->slotSpace, slotSpace(slot, index));
+                resolvedItems[index] = GridSpace { };
+            resolvedItems[index] = max(*resolvedItems[index], slotSpace(slot, index));
         }
     }
@@ -175 +171 @@
                 ASSERT(unresolvedColumnCount);
                 --unresolvedColumnCount;
-                unresolvedSpanningSpace -= resolvedItems[spanIndex]->slotSpace;
+                unresolvedSpanningSpace -= *resolvedItems[spanIndex];
             }
             ASSERT(unresolvedColumnCount);
@@ -182 +178 @@
                 if (resolvedItems[spanIndex])
                     continue;
-                resolvedItems[spanIndex] = ResolvedItem { equalSpaceForSpannedColumns };
+                resolvedItems[spanIndex] = equalSpaceForSpannedColumns;
             }
         } else {
@@ -191 +187 @@
             auto resolvedSpanningSpace = GridSpace { };
             for (auto spanIndex = SpanType::startSpan(cell); spanIndex < SpanType::endSpan(cell); ++spanIndex)
-                resolvedSpanningSpace += resolvedItems[spanIndex]->slotSpace;
+                resolvedSpanningSpace += *resolvedItems[spanIndex];
             if (resolvedSpanningSpace.preferredSpace >= unresolvedSpanningSpace.preferredSpace) {
                 // The spanning cell fits the spanned columns/rows just fine. Nothing to distribute.
@@ -201 +197 @@
                 auto columnsFlexBase = spaceToDistribute.flexBase / resolvedSpanningSpace.flexBase;
                 for (auto spanIndex = SpanType::startSpan(cell); spanIndex < SpanType::endSpan(cell); ++spanIndex)
-                    resolvedItems[spanIndex]->slotSpace += GridSpace { resolvedItems[spanIndex]->slotSpace.preferredSpace * columnsFlexBase, resolvedItems[spanIndex]->slotSpace.flexBase * columnsFlexBase};
+                    *resolvedItems[spanIndex] += GridSpace { resolvedItems[spanIndex]->preferredSpace * columnsFlexBase, resolvedItems[spanIndex]->flexBase * columnsFlexBase};
             }
         }
@@ -214 +210 @@
     auto adjustabledSpace = GridSpace { };
     for (auto& resolvedItem : resolvedItems)
-        adjustabledSpace += resolvedItem->slotSpace;
+        adjustabledSpace += *resolvedItem;
 
     Vector<LayoutUnit> distributedSpaces(resolvedItems.size());
@@ -225 +221 @@
     auto columnsFlexBase = adjustabledSpace.flexBase ? spaceToDistribute / adjustabledSpace.flexBase : 0.f;
     for (size_t index = 0; index < resolvedItems.size(); ++index) {
-        auto columnExtraSpace = columnsFlexBase * resolvedItems[index]->slotSpace.flexBase;
-        distributedSpaces[index] = LayoutUnit { resolvedItems[index]->slotSpace.preferredSpace + columnExtraSpace };
+        auto columnExtraSpace = columnsFlexBase * resolvedItems[index]->flexBase;
+        distributedSpaces[index] = LayoutUnit { resolvedItems[index]->preferredSpace + columnExtraSpace };
     }
     return distributedSpaces;