<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[279306] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/279306">279306</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-06-25 19:26:41 -0700 (Fri, 25 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextstableTableLayoutcpp">trunk/Source/WebCore/layout/formattingContexts/table/TableLayout.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (279305 => 279306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-26 01:47:28 UTC (rev 279305)
+++ trunk/Source/WebCore/ChangeLog      2021-06-26 02:26:41 UTC (rev 279306)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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):
+
</ins><span class="cx"> 2021-06-25  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS] WebGL content is unable to use the discrete GPU
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextstableTableLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/table/TableLayout.cpp (279305 => 279306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/table/TableLayout.cpp     2021-06-26 01:47:28 UTC (rev 279305)
+++ trunk/Source/WebCore/layout/formattingContexts/table/TableLayout.cpp        2021-06-26 02:26:41 UTC (rev 279306)
</span><span class="lines">@@ -113,14 +113,10 @@
</span><span class="cx"> template <typename SpanType>
</span><span class="cx"> static Vector<LayoutUnit> distributeAvailableSpace(const TableGrid& grid, LayoutUnit availableSpace, const WTF::Function<GridSpace(const TableGrid::Slot&, size_t)>& slotSpace)
</span><span class="cx"> {
</span><del>-    struct ResolvedItem {
-        GridSpace slotSpace;
-    };
-
</del><span class="cx">     auto& columns = grid.columns();
</span><span class="cx">     auto& rows = grid.rows();
</span><span class="cx">     // 1. Collect the non-spanning spaces first. They are used for the final distribution as well as for distributing the spanning space.
</span><del>-    Vector<std::optional<ResolvedItem>> resolvedItems(SpanType::size(grid));
</del><ins>+    Vector<std::optional<GridSpace>> resolvedItems(SpanType::size(grid));
</ins><span class="cx">     for (size_t columnIndex = 0; columnIndex < columns.size(); ++columnIndex) {
</span><span class="cx">         for (size_t rowIndex = 0; rowIndex < rows.size(); ++rowIndex) {
</span><span class="cx">             auto& slot = *grid.slot({ columnIndex, rowIndex });
</span><span class="lines">@@ -128,8 +124,8 @@
</span><span class="cx">                 continue;
</span><span class="cx">             auto index = SpanType::index(columnIndex, rowIndex);
</span><span class="cx">             if (!resolvedItems[index])
</span><del>-                resolvedItems[index] = ResolvedItem { };
-            resolvedItems[index]->slotSpace = max(resolvedItems[index]->slotSpace, slotSpace(slot, index));
</del><ins>+                resolvedItems[index] = GridSpace { };
+            resolvedItems[index] = max(*resolvedItems[index], slotSpace(slot, index));
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -174,7 +170,7 @@
</span><span class="cx">                     continue;
</span><span class="cx">                 ASSERT(unresolvedColumnCount);
</span><span class="cx">                 --unresolvedColumnCount;
</span><del>-                unresolvedSpanningSpace -= resolvedItems[spanIndex]->slotSpace;
</del><ins>+                unresolvedSpanningSpace -= *resolvedItems[spanIndex];
</ins><span class="cx">             }
</span><span class="cx">             ASSERT(unresolvedColumnCount);
</span><span class="cx">             auto equalSpaceForSpannedColumns = unresolvedSpanningSpace / unresolvedColumnCount;
</span><span class="lines">@@ -181,7 +177,7 @@
</span><span class="cx">             for (auto spanIndex = SpanType::startSpan(cell); spanIndex < SpanType::endSpan(cell); ++spanIndex) {
</span><span class="cx">                 if (resolvedItems[spanIndex])
</span><span class="cx">                     continue;
</span><del>-                resolvedItems[spanIndex] = ResolvedItem { equalSpaceForSpannedColumns };
</del><ins>+                resolvedItems[spanIndex] = equalSpaceForSpannedColumns;
</ins><span class="cx">             }
</span><span class="cx">         } else {
</span><span class="cx">             // 1. Collect the non-spaning resolved spaces.
</span><span class="lines">@@ -190,7 +186,7 @@
</span><span class="cx">             // New resolved widths: [ 3 ] [ 6 ].
</span><span class="cx">             auto resolvedSpanningSpace = GridSpace { };
</span><span class="cx">             for (auto spanIndex = SpanType::startSpan(cell); spanIndex < SpanType::endSpan(cell); ++spanIndex)
</span><del>-                resolvedSpanningSpace += resolvedItems[spanIndex]->slotSpace;
</del><ins>+                resolvedSpanningSpace += *resolvedItems[spanIndex];
</ins><span class="cx">             if (resolvedSpanningSpace.preferredSpace >= unresolvedSpanningSpace.preferredSpace) {
</span><span class="cx">                 // The spanning cell fits the spanned columns/rows just fine. Nothing to distribute.
</span><span class="cx">                 continue;
</span><span class="lines">@@ -200,7 +196,7 @@
</span><span class="cx">             if (!spaceToDistribute.isEmpty()) {
</span><span class="cx">                 auto columnsFlexBase = spaceToDistribute.flexBase / resolvedSpanningSpace.flexBase;
</span><span class="cx">                 for (auto spanIndex = SpanType::startSpan(cell); spanIndex < SpanType::endSpan(cell); ++spanIndex)
</span><del>-                    resolvedItems[spanIndex]->slotSpace += GridSpace { resolvedItems[spanIndex]->slotSpace.preferredSpace * columnsFlexBase, resolvedItems[spanIndex]->slotSpace.flexBase * columnsFlexBase};
</del><ins>+                    *resolvedItems[spanIndex] += GridSpace { resolvedItems[spanIndex]->preferredSpace * columnsFlexBase, resolvedItems[spanIndex]->flexBase * columnsFlexBase};
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -213,7 +209,7 @@
</span><span class="cx">     // Fixed size cells don't participate in available space distribution.
</span><span class="cx">     auto adjustabledSpace = GridSpace { };
</span><span class="cx">     for (auto& resolvedItem : resolvedItems)
</span><del>-        adjustabledSpace += resolvedItem->slotSpace;
</del><ins>+        adjustabledSpace += *resolvedItem;
</ins><span class="cx"> 
</span><span class="cx">     Vector<LayoutUnit> distributedSpaces(resolvedItems.size());
</span><span class="cx">     float spaceToDistribute = availableSpace;
</span><span class="lines">@@ -224,8 +220,8 @@
</span><span class="cx">     // we may assign less space to columns.
</span><span class="cx">     auto columnsFlexBase = adjustabledSpace.flexBase ? spaceToDistribute / adjustabledSpace.flexBase : 0.f;
</span><span class="cx">     for (size_t index = 0; index < resolvedItems.size(); ++index) {
</span><del>-        auto columnExtraSpace = columnsFlexBase * resolvedItems[index]->slotSpace.flexBase;
-        distributedSpaces[index] = LayoutUnit { resolvedItems[index]->slotSpace.preferredSpace + columnExtraSpace };
</del><ins>+        auto columnExtraSpace = columnsFlexBase * resolvedItems[index]->flexBase;
+        distributedSpaces[index] = LayoutUnit { resolvedItems[index]->preferredSpace + columnExtraSpace };
</ins><span class="cx">     }
</span><span class="cx">     return distributedSpaces;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>