<!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>[201234] trunk</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/201234">201234</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-05-20 16:56:34 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>`width: 1%` on nested table cell causes its table to hog horizontal space
https://bugs.webkit.org/show_bug.cgi?id=144696
<rdar://problem/20839572>
Reviewed by David Hyatt and Tim Horton.
This patch is based on https://chromium.googlesource.com/chromium/src/+/9428cfb16993a2329e87c65da096ca295132ef0f
Source/WebCore:
Tests: fast/table/inner-percent-width-affects-outer-floated-div.html
fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html
* rendering/AutoTableLayout.cpp:
(WebCore::shouldScaleColumnsForParent):
(WebCore::shouldScaleColumnsForSelf):
(WebCore::AutoTableLayout::computeIntrinsicLogicalWidths):
(WebCore::shouldScaleColumns): Deleted.
* rendering/AutoTableLayout.h:
* rendering/RenderTable.cpp:
(WebCore::RenderTable::updateLogicalWidth):
* rendering/TableLayout.h:
(WebCore::TableLayout::scaledWidthFromPercentColumns):
LayoutTests:
* fast/table/inner-percent-width-affects-outer-floated-div-expected.html: Added.
* fast/table/inner-percent-width-affects-outer-floated-div.html: Added.
* fast/table/inner-percent-width-doesnt-affect-ancestor-columns-expected.html: Added.
* fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html: Added.
* platform/mac/fast/table/border-collapsing/cached-change-row-border-width-expected.txt:
* platform/mac/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt:
* platform/mac/fast/table/max-width-integer-overflow-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttablebordercollapsingcachedchangerowborderwidthexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-row-border-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttablebordercollapsingcachedchangetbodyborderwidthexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttablemaxwidthintegeroverflowexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/table/max-width-integer-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttablebordercollapsingcachedchangerowborderwidthexpectedtxt">trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-row-border-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttablebordercollapsingcachedchangetbodyborderwidthexpectedtxt">trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttablemaxwidthintegeroverflowexpectedtxt">trunk/LayoutTests/platform/mac/fast/table/max-width-integer-overflow-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingAutoTableLayoutcpp">trunk/Source/WebCore/rendering/AutoTableLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingAutoTableLayouth">trunk/Source/WebCore/rendering/AutoTableLayout.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTableLayouth">trunk/Source/WebCore/rendering/TableLayout.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttableinnerpercentwidthaffectsouterfloateddivexpectedhtml">trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttableinnerpercentwidthaffectsouterfloateddivhtml">trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div.html</a></li>
<li><a href="#trunkLayoutTestsfasttableinnerpercentwidthdoesntaffectancestorcolumnsexpectedhtml">trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttableinnerpercentwidthdoesntaffectancestorcolumnshtml">trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/LayoutTests/ChangeLog 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-20 Zalan Bujtas <zalan@apple.com>
+
+ `width: 1%` on nested table cell causes its table to hog horizontal space
+ https://bugs.webkit.org/show_bug.cgi?id=144696
+ <rdar://problem/20839572>
+
+ Reviewed by David Hyatt and Tim Horton.
+
+ This patch is based on https://chromium.googlesource.com/chromium/src/+/9428cfb16993a2329e87c65da096ca295132ef0f
+
+ * fast/table/inner-percent-width-affects-outer-floated-div-expected.html: Added.
+ * fast/table/inner-percent-width-affects-outer-floated-div.html: Added.
+ * fast/table/inner-percent-width-doesnt-affect-ancestor-columns-expected.html: Added.
+ * fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html: Added.
+ * platform/mac/fast/table/border-collapsing/cached-change-row-border-width-expected.txt:
+ * platform/mac/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt:
+ * platform/mac/fast/table/max-width-integer-overflow-expected.txt:
+
</ins><span class="cx"> 2016-05-20 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Properly handle blobs in Workers.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttableinnerpercentwidthaffectsouterfloateddivexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div-expected.html (0 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div-expected.html (rev 0)
+++ trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div-expected.html 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<!DOCTYPE html>
+<p>There should be a blue square below. Inner table's percent-driven width
+should affect the shrink-to-fit div.</p>
+<div style="width: 200px; height: 200px; background: blue;"></div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttableinnerpercentwidthaffectsouterfloateddivhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div.html (0 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div.html (rev 0)
+++ trunk/LayoutTests/fast/table/inner-percent-width-affects-outer-floated-div.html 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<p>There should be a blue square below. Inner table's percent-driven width
+should affect the shrink-to-fit div.</p>
+<div style="float:left; background:blue;">
+ <table cellspacing="0" cellpadding="0">
+ <td style="width:20%;">
+ <div style="width:40px; height:200px;"></div>
+ </td>
+ <td></td>
+ </table>
+</div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttableinnerpercentwidthdoesntaffectancestorcolumnsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns-expected.html (0 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns-expected.html (rev 0)
+++ trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns-expected.html 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<table style="width: 300px" cellspacing="0" cellpadding="0">
+ <td style="background: yellow;">
+ <div style="width: 20px; height: 150px;"></div>
+ </td>
+ <td style="background: green;">
+ <div style="width: 40px; height: 150px;"></div>
+ </td>
+</table>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttableinnerpercentwidthdoesntaffectancestorcolumnshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html (0 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html (rev 0)
+++ trunk/LayoutTests/fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<table style="width: 300px" cellspacing="0" cellpadding="0">
+ <td style="background: red;">
+ <div style="background: blue">
+ <table cellspacing="0" cellpadding="0">
+ <td style="width:1%; background: yellow;">
+ <div style="width:20px; height:150px;"></div>
+ </td>
+ </table>
+ </div>
+ </td>
+ <td style="background: green;">
+ <div style="width:40px; height: 150px;"></div>
+ </td>
+</table>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttablebordercollapsingcachedchangerowborderwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-row-border-width-expected.txt (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-row-border-width-expected.txt 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-row-border-width-expected.txt 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- RenderTable {TABLE} at (0,0) size 56x103 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 52x100
- RenderTableRow {TR} at (0,0) size 52x50 [border: (4px solid #FFFF00)]
- RenderTableCell {TD} at (0,22) size 52x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
- RenderTableRow {TR} at (0,50) size 52x50
- RenderTableCell {TD} at (0,72) size 52x6 [border: (2px none #000000)] [r=1 c=0 rs=1 cs=1]
</del><ins>+ RenderTable {TABLE} at (0,0) size 58x103 [border: (2px solid #0000FF)]
+ RenderTableSection {TBODY} at (2,2) size 54x100
+ RenderTableRow {TR} at (0,0) size 54x50 [border: (4px solid #FFFF00)]
+ RenderTableCell {TD} at (0,22) size 54x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,50) size 54x50
+ RenderTableCell {TD} at (0,73) size 54x4 [border: (2px none #000000)] [r=1 c=0 rs=1 cs=1]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttablebordercollapsingcachedchangetbodyborderwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/LayoutTests/platform/ios-simulator/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -3,15 +3,15 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- RenderTable {TABLE} at (0,0) size 109x153 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 105x100 [border: (4px solid #FFFF00)]
- RenderTableRow {TR} at (0,0) size 105x50
- RenderTableCell {TD} at (0,22) size 53x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (52,23) size 53x4 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
- RenderTableRow {TR} at (0,50) size 105x50
- RenderTableCell {TD} at (0,72) size 53x6 [border: (1px none #000000)] [r=1 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (52,73) size 53x4 [border: none] [r=1 c=1 rs=1 cs=1]
- RenderTableSection {TBODY} at (2,102) size 105x50
- RenderTableRow {TR} at (0,0) size 105x50
- RenderTableCell {TD} at (0,22) size 53x6 [border: (2px none #000000)] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (52,22) size 53x6 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTable {TABLE} at (0,0) size 112x153 [border: (2px solid #0000FF)]
+ RenderTableSection {TBODY} at (2,2) size 108x100 [border: (4px solid #FFFF00)]
+ RenderTableRow {TR} at (0,0) size 108x50
+ RenderTableCell {TD} at (0,23) size 54x4 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (54,23) size 54x4 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,50) size 108x50
+ RenderTableCell {TD} at (0,73) size 54x4 [border: (1px none #000000)] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (54,73) size 54x4 [border: none] [r=1 c=1 rs=1 cs=1]
+ RenderTableSection {TBODY} at (2,102) size 108x50
+ RenderTableRow {TR} at (0,0) size 108x50
+ RenderTableCell {TD} at (0,23) size 54x4 [border: (2px none #000000)] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (54,23) size 54x4 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttablemaxwidthintegeroverflowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/table/max-width-integer-overflow-expected.txt (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/table/max-width-integer-overflow-expected.txt 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/LayoutTests/platform/ios-simulator/fast/table/max-width-integer-overflow-expected.txt 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -6,16 +6,16 @@
</span><span class="cx"> RenderTable {TABLE} at (0,0) size 780x24 [bgcolor=#FF0000]
</span><span class="cx"> RenderTableSection {TBODY} at (0,0) size 780x24
</span><span class="cx"> RenderTableRow {TR} at (0,0) size 780x24
</span><del>- RenderTableCell {TD} at (0,0) size 770x24 [r=0 c=0 rs=1 cs=1]
- RenderTable {TABLE} at (0,0) size 770x24
- RenderTableSection {TBODY} at (0,0) size 770x24
- RenderTableRow {TR} at (0,0) size 770x24
- RenderTableCell {TD} at (0,0) size 770x24 [r=0 c=0 rs=1 cs=1]
- RenderBlock {DIV} at (0,0) size 770x24
- RenderTable {TABLE} at (0,0) size 770x24 [bgcolor=#008000]
- RenderTableSection {TBODY} at (0,0) size 770x24
- RenderTableRow {TR} at (0,2) size 770x20
- RenderTableCell {TD} at (2,11) size 762x2 [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (766,11) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (770,0) size 10x24 [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (0,0) size 756x24 [r=0 c=0 rs=1 cs=1]
+ RenderTable {TABLE} at (0,0) size 310x24
+ RenderTableSection {TBODY} at (0,0) size 310x24
+ RenderTableRow {TR} at (0,0) size 310x24
+ RenderTableCell {TD} at (0,0) size 310x24 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 310x24
+ RenderTable {TABLE} at (0,0) size 310x24 [bgcolor=#008000]
+ RenderTableSection {TBODY} at (0,0) size 310x24
+ RenderTableRow {TR} at (0,2) size 310x20
+ RenderTableCell {TD} at (2,11) size 302x2 [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (306,11) size 2x2 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (755,0) size 25x24 [r=0 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 10x24 [bgcolor=#008000]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttablebordercollapsingcachedchangerowborderwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-row-border-width-expected.txt (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-row-border-width-expected.txt 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-row-border-width-expected.txt 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- RenderTable {TABLE} at (0,0) size 56x103 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 52x100
- RenderTableRow {TR} at (0,0) size 52x50 [border: (4px solid #FFFF00)]
- RenderTableCell {TD} at (0,22) size 52x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
- RenderTableRow {TR} at (0,50) size 52x50
- RenderTableCell {TD} at (0,73) size 52x4 [border: (2px none #000000)] [r=1 c=0 rs=1 cs=1]
</del><ins>+ RenderTable {TABLE} at (0,0) size 58x103 [border: (2px solid #0000FF)]
+ RenderTableSection {TBODY} at (2,2) size 54x100
+ RenderTableRow {TR} at (0,0) size 54x50 [border: (4px solid #FFFF00)]
+ RenderTableCell {TD} at (0,22) size 54x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,50) size 54x50
+ RenderTableCell {TD} at (0,73) size 54x4 [border: (2px none #000000)] [r=1 c=0 rs=1 cs=1]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttablebordercollapsingcachedchangetbodyborderwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -3,15 +3,15 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- RenderTable {TABLE} at (0,0) size 109x153 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 105x100 [border: (4px solid #FFFF00)]
- RenderTableRow {TR} at (0,0) size 105x50
- RenderTableCell {TD} at (0,22) size 53x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (53,23) size 52x4 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
- RenderTableRow {TR} at (0,50) size 105x50
- RenderTableCell {TD} at (0,72) size 53x6 [border: (1px none #000000)] [r=1 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (53,73) size 52x4 [border: none] [r=1 c=1 rs=1 cs=1]
- RenderTableSection {TBODY} at (2,102) size 105x50
- RenderTableRow {TR} at (0,0) size 105x50
- RenderTableCell {TD} at (0,23) size 53x4 [border: (2px none #000000)] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (53,23) size 52x4 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTable {TABLE} at (0,0) size 111x153 [border: (2px solid #0000FF)]
+ RenderTableSection {TBODY} at (2,2) size 107x100 [border: (4px solid #FFFF00)]
+ RenderTableRow {TR} at (0,0) size 107x50
+ RenderTableCell {TD} at (0,23) size 54x4 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (54,23) size 53x4 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,50) size 107x50
+ RenderTableCell {TD} at (0,73) size 54x4 [border: (1px none #000000)] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (54,74) size 53x2 [border: none] [r=1 c=1 rs=1 cs=1]
+ RenderTableSection {TBODY} at (2,102) size 107x50
+ RenderTableRow {TR} at (0,0) size 107x50
+ RenderTableCell {TD} at (0,23) size 54x4 [border: (2px none #000000)] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (54,23) size 53x4 [border: (2px none #000000)] [r=0 c=1 rs=1 cs=1]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttablemaxwidthintegeroverflowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/table/max-width-integer-overflow-expected.txt (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/table/max-width-integer-overflow-expected.txt 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/LayoutTests/platform/mac/fast/table/max-width-integer-overflow-expected.txt 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -6,16 +6,16 @@
</span><span class="cx"> RenderTable {TABLE} at (0,0) size 780x24 [bgcolor=#FF0000]
</span><span class="cx"> RenderTableSection {TBODY} at (0,0) size 780x24
</span><span class="cx"> RenderTableRow {TR} at (0,0) size 780x24
</span><del>- RenderTableCell {TD} at (0,0) size 770x24 [r=0 c=0 rs=1 cs=1]
- RenderTable {TABLE} at (0,0) size 770x24
- RenderTableSection {TBODY} at (0,0) size 770x24
- RenderTableRow {TR} at (0,0) size 770x24
- RenderTableCell {TD} at (0,0) size 770x24 [r=0 c=0 rs=1 cs=1]
- RenderBlock {DIV} at (0,0) size 770x24
- RenderTable {TABLE} at (0,0) size 770x24 [bgcolor=#008000]
- RenderTableSection {TBODY} at (0,0) size 770x24
- RenderTableRow {TR} at (0,2) size 770x20
- RenderTableCell {TD} at (2,11) size 762x2 [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (766,11) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (770,0) size 10x24 [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (0,0) size 756x24 [r=0 c=0 rs=1 cs=1]
+ RenderTable {TABLE} at (0,0) size 310x24
+ RenderTableSection {TBODY} at (0,0) size 310x24
+ RenderTableRow {TR} at (0,0) size 310x24
+ RenderTableCell {TD} at (0,0) size 310x24 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 310x24
+ RenderTable {TABLE} at (0,0) size 310x24 [bgcolor=#008000]
+ RenderTableSection {TBODY} at (0,0) size 310x24
+ RenderTableRow {TR} at (0,2) size 310x20
+ RenderTableCell {TD} at (2,11) size 302x2 [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (306,11) size 2x2 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (755,0) size 25x24 [r=0 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 10x24 [bgcolor=#008000]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/Source/WebCore/ChangeLog 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-05-20 Zalan Bujtas <zalan@apple.com>
+
+ `width: 1%` on nested table cell causes its table to hog horizontal space
+ https://bugs.webkit.org/show_bug.cgi?id=144696
+ <rdar://problem/20839572>
+
+ Reviewed by David Hyatt and Tim Horton.
+
+ This patch is based on https://chromium.googlesource.com/chromium/src/+/9428cfb16993a2329e87c65da096ca295132ef0f
+
+ Tests: fast/table/inner-percent-width-affects-outer-floated-div.html
+ fast/table/inner-percent-width-doesnt-affect-ancestor-columns.html
+
+ * rendering/AutoTableLayout.cpp:
+ (WebCore::shouldScaleColumnsForParent):
+ (WebCore::shouldScaleColumnsForSelf):
+ (WebCore::AutoTableLayout::computeIntrinsicLogicalWidths):
+ (WebCore::shouldScaleColumns): Deleted.
+ * rendering/AutoTableLayout.h:
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::updateLogicalWidth):
+ * rendering/TableLayout.h:
+ (WebCore::TableLayout::scaledWidthFromPercentColumns):
+
</ins><span class="cx"> 2016-05-20 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Inconsistent state in playback controls
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingAutoTableLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/AutoTableLayout.cpp (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/AutoTableLayout.cpp 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/Source/WebCore/rendering/AutoTableLayout.cpp 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -182,9 +182,27 @@
</span><span class="cx"> recalcColumn(i);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldScaleColumnsForParent(const RenderTable& table)
+{
+ RenderBlock* containingBlock = table.containingBlock();
+ while (containingBlock && !is<RenderView>(containingBlock)) {
+ // It doesn't matter if our table is auto or fixed: auto means we don't
+ // scale. Fixed doesn't care if we do or not because it doesn't depend
+ // on the cell contents' preferred widths.
+ if (is<RenderTableCell>(containingBlock))
+ return false;
+ containingBlock = containingBlock->containingBlock();
+ }
+ return true;
+}
+
</ins><span class="cx"> // FIXME: This needs to be adapted for vertical writing modes.
</span><del>-static bool shouldScaleColumns(RenderTable* table)
</del><ins>+static bool shouldScaleColumnsForSelf(RenderTable* table)
</ins><span class="cx"> {
</span><ins>+ // Normally, scale all columns to satisfy this from CSS2.2:
+ // "A percentage value for a column width is relative to the table width.
+ // If the table has 'width: auto', a percentage represents a constraint on the column's width"
+
</ins><span class="cx"> // A special case. If this table is not fixed width and contained inside
</span><span class="cx"> // a cell, then don't bloat the maxwidth by examining percentage growth.
</span><span class="cx"> bool scale = true;
</span><span class="lines">@@ -221,7 +239,7 @@
</span><span class="cx"> maxWidth = 0;
</span><span class="cx"> float maxPercent = 0;
</span><span class="cx"> float maxNonPercent = 0;
</span><del>- bool scaleColumns = shouldScaleColumns(m_table);
</del><ins>+ bool scaleColumnsForSelf = shouldScaleColumnsForSelf(m_table);
</ins><span class="cx">
</span><span class="cx"> // We substitute 0 percent by (epsilon / percentScaleFactor) percent in two places below to avoid division by zero.
</span><span class="cx"> // FIXME: Handle the 0% cases properly.
</span><span class="lines">@@ -231,7 +249,7 @@
</span><span class="cx"> for (size_t i = 0; i < m_layoutStruct.size(); ++i) {
</span><span class="cx"> minWidth += m_layoutStruct[i].effectiveMinLogicalWidth;
</span><span class="cx"> maxWidth += m_layoutStruct[i].effectiveMaxLogicalWidth;
</span><del>- if (scaleColumns) {
</del><ins>+ if (scaleColumnsForSelf) {
</ins><span class="cx"> if (m_layoutStruct[i].effectiveLogicalWidth.isPercent()) {
</span><span class="cx"> float percent = std::min(m_layoutStruct[i].effectiveLogicalWidth.percent(), remainingPercent);
</span><span class="cx"> float logicalWidth = m_layoutStruct[i].effectiveMaxLogicalWidth * 100 / std::max(percent, epsilon);
</span><span class="lines">@@ -242,10 +260,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (scaleColumns) {
</del><ins>+ if (scaleColumnsForSelf) {
</ins><span class="cx"> maxNonPercent = maxNonPercent * 100 / std::max(remainingPercent, epsilon);
</span><del>- maxWidth = std::max(maxWidth, LayoutUnit(std::min<float>(maxNonPercent, tableMaxWidth)));
- maxWidth = std::max(maxWidth, LayoutUnit(std::min<float>(maxPercent, tableMaxWidth)));
</del><ins>+ m_scaledWidthFromPercentColumns = LayoutUnit(std::min<float>(maxNonPercent, tableMaxWidth));
+ m_scaledWidthFromPercentColumns = std::max(m_scaledWidthFromPercentColumns, LayoutUnit(std::min<float>(maxPercent, tableMaxWidth)));
+ if (m_scaledWidthFromPercentColumns > maxWidth && shouldScaleColumnsForParent(*m_table))
+ maxWidth = m_scaledWidthFromPercentColumns;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> maxWidth = std::max(maxWidth, LayoutUnit(spanMaxLogicalWidth));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingAutoTableLayouth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/AutoTableLayout.h (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/AutoTableLayout.h 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/Source/WebCore/rendering/AutoTableLayout.h 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> virtual ~AutoTableLayout();
</span><span class="cx">
</span><span class="cx"> void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) override;
</span><ins>+ LayoutUnit scaledWidthFromPercentColumns() const override { return m_scaledWidthFromPercentColumns; }
</ins><span class="cx"> void applyPreferredLogicalWidthQuirks(LayoutUnit& minWidth, LayoutUnit& maxWidth) const override;
</span><span class="cx"> void layout() override;
</span><span class="cx">
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> Vector<RenderTableCell*, 4> m_spanCells;
</span><span class="cx"> bool m_hasPercent : 1;
</span><span class="cx"> mutable bool m_effectiveLogicalWidthDirty : 1;
</span><ins>+ LayoutUnit m_scaledWidthFromPercentColumns;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -297,6 +297,13 @@
</span><span class="cx">
</span><span class="cx"> // Ensure we aren't bigger than our available width.
</span><span class="cx"> setLogicalWidth(std::min(availableContentLogicalWidth, maxPreferredLogicalWidth()));
</span><ins>+ LayoutUnit maxWidth = maxPreferredLogicalWidth();
+ // scaledWidthFromPercentColumns depends on m_layoutStruct in TableLayoutAlgorithmAuto, which
+ // maxPreferredLogicalWidth fills in. So scaledWidthFromPercentColumns has to be called after
+ // maxPreferredLogicalWidth.
+ LayoutUnit scaledWidth = m_tableLayout->scaledWidthFromPercentColumns() + bordersPaddingAndSpacingInRowDirection();
+ maxWidth = std::max(scaledWidth, maxWidth);
+ setLogicalWidth(std::min(availableContentLogicalWidth, maxWidth));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Ensure we aren't smaller than our min preferred width.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTableLayouth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TableLayout.h (201233 => 201234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TableLayout.h 2016-05-20 23:46:06 UTC (rev 201233)
+++ trunk/Source/WebCore/rendering/TableLayout.h 2016-05-20 23:56:34 UTC (rev 201234)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #ifndef TableLayout_h
</span><span class="cx"> #define TableLayout_h
</span><span class="cx">
</span><ins>+#include "LayoutUnit.h"
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="lines">@@ -39,6 +40,7 @@
</span><span class="cx"> virtual ~TableLayout() { }
</span><span class="cx">
</span><span class="cx"> virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) = 0;
</span><ins>+ virtual LayoutUnit scaledWidthFromPercentColumns() const { return LayoutUnit(0); }
</ins><span class="cx"> virtual void applyPreferredLogicalWidthQuirks(LayoutUnit& minWidth, LayoutUnit& maxWidth) const = 0;
</span><span class="cx"> virtual void layout() = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>