<!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>[265694] branches/safari-610.1-branch</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/265694">265694</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2020-08-14 12:48:33 -0700 (Fri, 14 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/265499">r265499</a>. rdar://problem/67084446

    [AutoTableLayout] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/263855">r263855</a>) Paypal email is rendered right aligned on Safari
    https://bugs.webkit.org/show_bug.cgi?id=215340
    <rdar://problem/66540254>

    Reviewed by Simon Fraser.

    Source/WebCore:

    Prior to <a href="http://trac.webkit.org/projects/webkit/changeset/263855">r263855</a>, these zero-length, non-empty columns had the preferred width value of 1px and the available space got distributed based on this made-up 1px value.
    In this patch, we distribute the available horizontal space evenly among these zero-length, 'width: auto' columns.

    Test: fast/table/zero-length-non-empty-columns-with-auto-width.html

    * rendering/AutoTableLayout.cpp:
    (WebCore::AutoTableLayout::layout):

    LayoutTests:

    * fast/table/zero-length-non-empty-columns-with-auto-width-expected.html: Added.
    * fast/table/zero-length-non-empty-columns-with-auto-width.html: Added.
    * platform/mac/fast/table/empty-cells-expected.txt: progression

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265499 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6101branchLayoutTestsChangeLog">branches/safari-610.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6101branchLayoutTestsplatformiosfasttableemptycellsexpectedtxt">branches/safari-610.1-branch/LayoutTests/platform/ios/fast/table/empty-cells-expected.txt</a></li>
<li><a href="#branchessafari6101branchLayoutTestsplatformmacfasttableemptycellsexpectedtxt">branches/safari-610.1-branch/LayoutTests/platform/mac/fast/table/empty-cells-expected.txt</a></li>
<li><a href="#branchessafari6101branchLayoutTestsplatformwinfasttableemptycellsexpectedtxt">branches/safari-610.1-branch/LayoutTests/platform/win/fast/table/empty-cells-expected.txt</a></li>
<li><a href="#branchessafari6101branchSourceWebCoreChangeLog">branches/safari-610.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6101branchSourceWebCorerenderingAutoTableLayoutcpp">branches/safari-610.1-branch/Source/WebCore/rendering/AutoTableLayout.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6101branchLayoutTestsfasttablezerolengthnonemptycolumnswithautowidthexpectedhtml">branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width-expected.html</a></li>
<li><a href="#branchessafari6101branchLayoutTestsfasttablezerolengthnonemptycolumnswithautowidthhtml">branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6101branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1-branch/LayoutTests/ChangeLog (265693 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/LayoutTests/ChangeLog       2020-08-14 19:48:29 UTC (rev 265693)
+++ branches/safari-610.1-branch/LayoutTests/ChangeLog  2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2020-08-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r265499. rdar://problem/67084446
+
+    [AutoTableLayout] REGRESSION(r263855) Paypal email is rendered right aligned on Safari
+    https://bugs.webkit.org/show_bug.cgi?id=215340
+    <rdar://problem/66540254>
+    
+    Reviewed by Simon Fraser.
+    
+    Source/WebCore:
+    
+    Prior to r263855, these zero-length, non-empty columns had the preferred width value of 1px and the available space got distributed based on this made-up 1px value.
+    In this patch, we distribute the available horizontal space evenly among these zero-length, 'width: auto' columns.
+    
+    Test: fast/table/zero-length-non-empty-columns-with-auto-width.html
+    
+    * rendering/AutoTableLayout.cpp:
+    (WebCore::AutoTableLayout::layout):
+    
+    LayoutTests:
+    
+    * fast/table/zero-length-non-empty-columns-with-auto-width-expected.html: Added.
+    * fast/table/zero-length-non-empty-columns-with-auto-width.html: Added.
+    * platform/mac/fast/table/empty-cells-expected.txt: progression
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265499 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-08-11  Zalan Bujtas  <zalan@apple.com>
+
+            [AutoTableLayout] REGRESSION(r263855) Paypal email is rendered right aligned on Safari
+            https://bugs.webkit.org/show_bug.cgi?id=215340
+            <rdar://problem/66540254>
+
+            Reviewed by Simon Fraser.
+
+            * fast/table/zero-length-non-empty-columns-with-auto-width-expected.html: Added.
+            * fast/table/zero-length-non-empty-columns-with-auto-width.html: Added.
+            * platform/mac/fast/table/empty-cells-expected.txt: progression
+
</ins><span class="cx"> 2020-08-12  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r265515. rdar://problem/66943894
</span></span></pre></div>
<a id="branchessafari6101branchLayoutTestsfasttablezerolengthnonemptycolumnswithautowidthexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width-expected.html (0 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width-expected.html                          (rev 0)
+++ branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width-expected.html     2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<title>This tests that zero width, but non-empty columns get horizontal space. PASS if the green cell on the right is visible</title>
+<style>
+div {
+  font-size: 20px;
+  font-family: ahem;
+  height: 40px;
+  position: relative;
+}
+</style>
+<div style="background-color: green; width: 200px;"></div>
+<div style="background-color: yellow; width: 400px; top: -40px; left: 200px;">PASS if green is visible-></div>
+<div style="background-color: green; width: 200px; top: -80px; left: 600px;"></div>
</ins></span></pre></div>
<a id="branchessafari6101branchLayoutTestsfasttablezerolengthnonemptycolumnswithautowidthhtml"></a>
<div class="addfile"><h4>Added: branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width.html (0 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width.html                           (rev 0)
+++ branches/safari-610.1-branch/LayoutTests/fast/table/zero-length-non-empty-columns-with-auto-width.html      2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<title>This tests that zero width, but non-empty columns get horizontal space. PASS if the green cell on the right is visible</title>
+<style>
+td {
+  font-size: 20px !important;
+  font-family: ahem;
+}
+</style>
+<table cellspacing="0" cellpadding="0" style="width: 800px">
+<tr>
+<td style="background-color: green; font-size: 0px;"></td>
+<td style="background-color: yellow; width: 400px;">PASS if green is visible-></td>
+<td style="background-color: green; font-size: 0px;"></td>
+</tr>
+</table>
</ins></span></pre></div>
<a id="branchessafari6101branchLayoutTestsplatformiosfasttableemptycellsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1-branch/LayoutTests/platform/ios/fast/table/empty-cells-expected.txt (265693 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/LayoutTests/platform/ios/fast/table/empty-cells-expected.txt        2020-08-14 19:48:29 UTC (rev 265693)
+++ branches/safari-610.1-branch/LayoutTests/platform/ios/fast/table/empty-cells-expected.txt   2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -148,8 +148,8 @@
</span><span class="cx">       RenderTable {TABLE} at (0,566) size 800x54 [border: (2px solid #000000)]
</span><span class="cx">         RenderTableSection {TBODY} at (2,2) size 796x50
</span><span class="cx">           RenderTableRow {TR} at (0,0) size 796x25
</span><del>-            RenderTableCell {TD} at (0,12) size 398x0 [r=0 c=0 rs=1 cs=1]
-            RenderTableCell {TD} at (398,12) size 0x0 [r=0 c=1 rs=1 cs=1]
</del><ins>+            RenderTableCell {TD} at (0,12) size 199x0 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (199,12) size 199x0 [r=0 c=1 rs=1 cs=1]
</ins><span class="cx">             RenderTableCell {TD} at (398,2) size 398x21 [bgcolor=#FF0000] [r=0 c=2 rs=1 cs=1]
</span><span class="cx">               RenderText {#text} at (0,0) size 238x20
</span><span class="cx">                 text run at (0,1) width 238: "First row, first and second cell empty"
</span></span></pre></div>
<a id="branchessafari6101branchLayoutTestsplatformmacfasttableemptycellsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1-branch/LayoutTests/platform/mac/fast/table/empty-cells-expected.txt (265693 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/LayoutTests/platform/mac/fast/table/empty-cells-expected.txt        2020-08-14 19:48:29 UTC (rev 265693)
+++ branches/safari-610.1-branch/LayoutTests/platform/mac/fast/table/empty-cells-expected.txt   2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -148,8 +148,8 @@
</span><span class="cx">       RenderTable {TABLE} at (0,566) size 785x54 [border: (2px solid #000000)]
</span><span class="cx">         RenderTableSection {TBODY} at (2,2) size 781x50
</span><span class="cx">           RenderTableRow {TR} at (0,0) size 781x25
</span><del>-            RenderTableCell {TD} at (0,12) size 391x0 [r=0 c=0 rs=1 cs=1]
-            RenderTableCell {TD} at (390,12) size 0x0 [r=0 c=1 rs=1 cs=1]
</del><ins>+            RenderTableCell {TD} at (0,12) size 196x0 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (195,12) size 196x0 [r=0 c=1 rs=1 cs=1]
</ins><span class="cx">             RenderTableCell {TD} at (390,3) size 391x19 [bgcolor=#FF0000] [r=0 c=2 rs=1 cs=1]
</span><span class="cx">               RenderText {#text} at (0,0) size 237x19
</span><span class="cx">                 text run at (0,1) width 237: "First row, first and second cell empty"
</span></span></pre></div>
<a id="branchessafari6101branchLayoutTestsplatformwinfasttableemptycellsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1-branch/LayoutTests/platform/win/fast/table/empty-cells-expected.txt (265693 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/LayoutTests/platform/win/fast/table/empty-cells-expected.txt        2020-08-14 19:48:29 UTC (rev 265693)
+++ branches/safari-610.1-branch/LayoutTests/platform/win/fast/table/empty-cells-expected.txt   2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -148,8 +148,8 @@
</span><span class="cx">       RenderTable {TABLE} at (0,566) size 785x54 [border: (2px solid #000000)]
</span><span class="cx">         RenderTableSection {TBODY} at (2,2) size 781x50
</span><span class="cx">           RenderTableRow {TR} at (0,0) size 781x25
</span><del>-            RenderTableCell {TD} at (0,12) size 391x0 [r=0 c=0 rs=1 cs=1]
-            RenderTableCell {TD} at (390,12) size 0x0 [r=0 c=1 rs=1 cs=1]
</del><ins>+            RenderTableCell {TD} at (0,12) size 196x0 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (195,12) size 196x0 [r=0 c=1 rs=1 cs=1]
</ins><span class="cx">             RenderTableCell {TD} at (390,3) size 391x19 [bgcolor=#FF0000] [r=0 c=2 rs=1 cs=1]
</span><span class="cx">               RenderText {#text} at (0,0) size 233x19
</span><span class="cx">                 text run at (0,1) width 233: "First row, first and second cell empty"
</span></span></pre></div>
<a id="branchessafari6101branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1-branch/Source/WebCore/ChangeLog (265693 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/Source/WebCore/ChangeLog    2020-08-14 19:48:29 UTC (rev 265693)
+++ branches/safari-610.1-branch/Source/WebCore/ChangeLog       2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2020-08-14  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r265499. rdar://problem/67084446
+
+    [AutoTableLayout] REGRESSION(r263855) Paypal email is rendered right aligned on Safari
+    https://bugs.webkit.org/show_bug.cgi?id=215340
+    <rdar://problem/66540254>
+    
+    Reviewed by Simon Fraser.
+    
+    Source/WebCore:
+    
+    Prior to r263855, these zero-length, non-empty columns had the preferred width value of 1px and the available space got distributed based on this made-up 1px value.
+    In this patch, we distribute the available horizontal space evenly among these zero-length, 'width: auto' columns.
+    
+    Test: fast/table/zero-length-non-empty-columns-with-auto-width.html
+    
+    * rendering/AutoTableLayout.cpp:
+    (WebCore::AutoTableLayout::layout):
+    
+    LayoutTests:
+    
+    * fast/table/zero-length-non-empty-columns-with-auto-width-expected.html: Added.
+    * fast/table/zero-length-non-empty-columns-with-auto-width.html: Added.
+    * platform/mac/fast/table/empty-cells-expected.txt: progression
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265499 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-08-11  Zalan Bujtas  <zalan@apple.com>
+
+            [AutoTableLayout] REGRESSION(r263855) Paypal email is rendered right aligned on Safari
+            https://bugs.webkit.org/show_bug.cgi?id=215340
+            <rdar://problem/66540254>
+
+            Reviewed by Simon Fraser.
+
+            Prior to r263855, these zero-length, non-empty columns had the preferred width value of 1px and the available space got distributed based on this made-up 1px value.
+            In this patch, we distribute the available horizontal space evenly among these zero-length, 'width: auto' columns.
+
+            Test: fast/table/zero-length-non-empty-columns-with-auto-width.html
+
+            * rendering/AutoTableLayout.cpp:
+            (WebCore::AutoTableLayout::layout):
+
+2020-08-14  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r265420. rdar://problem/67083903
</span><span class="cx"> 
</span><span class="cx">     REGRESSION (r260831): Web process crashes under Editor::setComposition() after navigating with marked text
</span></span></pre></div>
<a id="branchessafari6101branchSourceWebCorerenderingAutoTableLayoutcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1-branch/Source/WebCore/rendering/AutoTableLayout.cpp (265693 => 265694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1-branch/Source/WebCore/rendering/AutoTableLayout.cpp        2020-08-14 19:48:29 UTC (rev 265693)
+++ branches/safari-610.1-branch/Source/WebCore/rendering/AutoTableLayout.cpp   2020-08-14 19:48:33 UTC (rev 265694)
</span><span class="lines">@@ -530,6 +530,7 @@
</span><span class="cx">     bool havePercent = false;
</span><span class="cx">     float totalRelative = 0;
</span><span class="cx">     int numFixed = 0;
</span><ins>+    size_t numberOfNonEmptyAuto = 0;
</ins><span class="cx">     Optional<float> totalAuto;
</span><span class="cx">     float totalFixed = 0;
</span><span class="cx">     float totalPercent = 0;
</span><span class="lines">@@ -558,6 +559,7 @@
</span><span class="cx">             if (m_layoutStruct[i].emptyCellsOnly)
</span><span class="cx">                 numAutoEmptyCellsOnly++;
</span><span class="cx">             else {
</span><ins>+                ++numberOfNonEmptyAuto;
</ins><span class="cx">                 totalAuto = totalAuto.valueOr(0.f) + m_layoutStruct[i].effectiveMaxLogicalWidth;
</span><span class="cx">                 allocAuto += cellLogicalWidth;
</span><span class="cx">             }
</span><span class="lines">@@ -620,15 +622,23 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // now satisfy variable
</span><del>-    if (available > 0 && totalAuto) {
-        available += allocAuto; // this gets redistributed
</del><ins>+    if (available > 0 && numberOfNonEmptyAuto) {
+        ASSERT(totalAuto);
+        available += allocAuto; // this gets redistributed.
+        auto equalWidthForZeroLengthColumns = Optional<float> { };
+        if (!*totalAuto) {
+            // All columns in this table are (non-empty)zero length with 'width: auto'.
+            equalWidthForZeroLengthColumns = available / numberOfNonEmptyAuto;
+        }
</ins><span class="cx">         for (size_t i = 0; i < nEffCols; ++i) {
</span><del>-            Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
-            if (logicalWidth.isAuto() && !m_layoutStruct[i].emptyCellsOnly) {
-                auto cellLogicalWidth = std::max(m_layoutStruct[i].computedLogicalWidth, *totalAuto ? available * m_layoutStruct[i].effectiveMaxLogicalWidth / *totalAuto : available);
-                available -= cellLogicalWidth;
-                *totalAuto -= m_layoutStruct[i].effectiveMaxLogicalWidth;
-                m_layoutStruct[i].computedLogicalWidth = cellLogicalWidth;
</del><ins>+            auto& column = m_layoutStruct[i];
+            if (!column.effectiveLogicalWidth.isAuto() || column.emptyCellsOnly)
+                continue;
+            auto columnWidthCandidate = equalWidthForZeroLengthColumns ? *equalWidthForZeroLengthColumns : available * column.effectiveMaxLogicalWidth / *totalAuto;
+            column.computedLogicalWidth = std::max(column.computedLogicalWidth, columnWidthCandidate);
+            available -= column.computedLogicalWidth;
+            if (!equalWidthForZeroLengthColumns) {
+                *totalAuto -= column.effectiveMaxLogicalWidth;
</ins><span class="cx">                 if (*totalAuto <= 0)
</span><span class="cx">                     break;
</span><span class="cx">             }
</span></span></pre>
</div>
</div>

</body>
</html>