<!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>[248671] 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/248671">248671</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-08-14 08:39:23 -0700 (Wed, 14 Aug 2019)</dd>
</dl>

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayouttableformattingTableFormattingContextcpp">trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayouttableformattingTableGridcpp">trunk/Source/WebCore/layout/tableformatting/TableGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorelayouttableformattingTableGridh">trunk/Source/WebCore/layout/tableformatting/TableGrid.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248670 => 248671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-14 13:42:37 UTC (rev 248670)
+++ trunk/Source/WebCore/ChangeLog      2019-08-14 15:39:23 UTC (rev 248671)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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):
+
</ins><span class="cx"> 2019-08-14  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         ThreadableBlobRegistry::blobSize should take a SessionID as parameter
</span></span></pre></div>
<a id="trunkSourceWebCorelayouttableformattingTableFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp (248670 => 248671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp   2019-08-14 13:42:37 UTC (rev 248670)
+++ trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp      2019-08-14 15:39:23 UTC (rev 248671)
</span><span class="lines">@@ -85,6 +85,25 @@
</span><span class="cx"> 
</span><span class="cx"> void TableFormattingContext::computePreferredWidthForColumns() const
</span><span class="cx"> {
</span><ins>+    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;
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void TableFormattingContext::computeTableWidth() const
</span></span></pre></div>
<a id="trunkSourceWebCorelayouttableformattingTableGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/tableformatting/TableGrid.cpp (248670 => 248671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/tableformatting/TableGrid.cpp        2019-08-14 13:42:37 UTC (rev 248670)
+++ trunk/Source/WebCore/layout/tableformatting/TableGrid.cpp   2019-08-14 15:39:23 UTC (rev 248671)
</span><span class="lines">@@ -51,6 +51,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TableGrid::SlotInfo* TableGrid::slot(SlotPosition position)
+{
+    return m_slotMap.get(position);
+}
+
</ins><span class="cx"> void TableGrid::appendCell(const Box& tableCellBox)
</span><span class="cx"> {
</span><span class="cx">     int rowSpan = tableCellBox.rowSpan();
</span><span class="lines">@@ -79,7 +84,7 @@
</span><span class="cx">         for (int column = 1; column <= columnSpan; ++column) {
</span><span class="cx">             auto position = SlotPosition { initialSlotPosition.x() + row - 1, initialSlotPosition.y() + column - 1 };
</span><span class="cx">             ASSERT(!m_slotMap.contains(position));
</span><del>-            m_slotMap.add(position, SlotInfo { *cellInfo });
</del><ins>+            m_slotMap.add(position, std::make_unique<SlotInfo>(*cellInfo));
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     m_cellList.add(WTFMove(cellInfo));
</span></span></pre></div>
<a id="trunkSourceWebCorelayouttableformattingTableGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/tableformatting/TableGrid.h (248670 => 248671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/tableformatting/TableGrid.h  2019-08-14 13:42:37 UTC (rev 248670)
+++ trunk/Source/WebCore/layout/tableformatting/TableGrid.h     2019-08-14 15:39:23 UTC (rev 248671)
</span><span class="lines">@@ -46,11 +46,8 @@
</span><span class="cx">     void insertCell(const Box&, const Box& before);
</span><span class="cx">     void removeCell(const Box&);
</span><span class="cx"> 
</span><del>-private:
</del><span class="cx">     using SlotPosition = IntPoint;
</span><span class="cx">     using CellSize = IntSize;
</span><del>-    using SlotLogicalSize = LayoutSize;
-
</del><span class="cx">     struct CellInfo : public CanMakeWeakPtr<CellInfo> {
</span><span class="cx">         CellInfo(const Box& tableCellBox, SlotPosition, CellSize);
</span><span class="cx"> 
</span><span class="lines">@@ -58,17 +55,22 @@
</span><span class="cx">         SlotPosition position;
</span><span class="cx">         CellSize size;
</span><span class="cx">     };
</span><ins>+    using CellList = WTF::ListHashSet<std::unique_ptr<CellInfo>>;
+    CellList& cells() { return m_cellList; }
</ins><span class="cx"> 
</span><ins>+    using SlotLogicalSize = LayoutSize;
</ins><span class="cx">     struct SlotInfo {
</span><span class="cx">         SlotInfo() = default;
</span><span class="cx">         SlotInfo(CellInfo&);
</span><span class="cx"> 
</span><span class="cx">         WeakPtr<CellInfo> cell;
</span><ins>+        FormattingContext::IntrinsicWidthConstraints widthConstraints;
</ins><span class="cx">         SlotLogicalSize size;
</span><span class="cx">     };
</span><ins>+    SlotInfo* slot(SlotPosition);
</ins><span class="cx"> 
</span><del>-    using CellList = WTF::ListHashSet<std::unique_ptr<CellInfo>>;
-    using SlotMap = WTF::HashMap<SlotPosition, SlotInfo>;
</del><ins>+private:
+    using SlotMap = WTF::HashMap<SlotPosition, std::unique_ptr<SlotInfo>>;
</ins><span class="cx">     SlotMap m_slotMap;
</span><span class="cx">     CellList m_cellList;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>