<!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>[201346] 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/201346">201346</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-05-24 13:02:31 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>fast/table/neighboring-cells-when-collapsed-border-changes.html is flaky.
https://bugs.webkit.org/show_bug.cgi?id=158009
Reviewed by David Hyatt.
RenderTable::invalidateCollapsedBorders() early returns on m_collapsedEmptyBorderIsPresent
which prevents us from marking neighboring cells dirty when style changes.
Decouple the "invalidate the collapsed borders" and the "mark the neighboring cells dirty" logic.
Source/WebCore:
Covered by existing tests. (and now we agree with FF on cached-change-cell-border-width.html)
* rendering/RenderTable.cpp:
(WebCore::RenderTable::invalidateCollapsedBorders):
(WebCore::markCellDirtyWhenCollapsedBorderChanges): Deleted.
* rendering/RenderTableCell.cpp:
(WebCore::markCellDirtyWhenCollapsedBorderChanges):
(WebCore::RenderTableCell::styleDidChange):
LayoutTests:
* fast/table/border-collapsing/cached-change-cell-border-width-expected.txt: Progression. FF agrees.
* fast/table/neighboring-cells-when-collapsed-border-changes.html:
* platform/ios-simulator-wk1/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt:
* platform/mac-wk1/TestExpectations:
* platform/mac/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasttablebordercollapsingcachedchangecellborderwidthexpectedtxt">trunk/LayoutTests/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttableneighboringcellswhencollapsedborderchangeshtml">trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk1fasttablebordercollapsingcachedchangecellborderwidthexpectedtxt">trunk/LayoutTests/platform/ios-simulator-wk1/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttablebordercollapsingcachedchangecellborderwidthexpectedtxt">trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/LayoutTests/ChangeLog 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-24 Zalan Bujtas <zalan@apple.com>
+
+ fast/table/neighboring-cells-when-collapsed-border-changes.html is flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=158009
+
+ Reviewed by David Hyatt.
+
+ RenderTable::invalidateCollapsedBorders() early returns on m_collapsedEmptyBorderIsPresent
+ which prevents us from marking neighboring cells dirty when style changes.
+ Decouple the "invalidate the collapsed borders" and the "mark the neighboring cells dirty" logic.
+
+ * fast/table/border-collapsing/cached-change-cell-border-width-expected.txt: Progression. FF agrees.
+ * fast/table/neighboring-cells-when-collapsed-border-changes.html:
+ * platform/ios-simulator-wk1/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt:
+ * platform/mac-wk1/TestExpectations:
+ * platform/mac/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt:
+
</ins><span class="cx"> 2016-05-24 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking mathml/wbr-in-mroot-crash.html as flaky on ios-simulator-wk2
</span></span></pre></div>
<a id="trunkLayoutTestsfasttablebordercollapsingcachedchangecellborderwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/LayoutTests/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -3,8 +3,8 @@
</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 113x54 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 110x50
- RenderTableRow {TR} at (0,0) size 110x50
- RenderTableCell {TD} at (0,22) size 55x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (55,23) size 55x4 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTable {TABLE} at (0,0) size 114x54 [border: (2px solid #0000FF)]
+ RenderTableSection {TBODY} at (2,2) size 111x50
+ RenderTableRow {TR} at (0,0) size 111x50
+ RenderTableCell {TD} at (0,22) size 56x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (56,23) size 55x4 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttableneighboringcellswhencollapsedborderchangeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> document.body.offsetWidth;
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.notifyDone();
</span><del>-}, 10);
</del><ins>+}, 0);
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk1fasttablebordercollapsingcachedchangecellborderwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk1/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk1/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/LayoutTests/platform/ios-simulator-wk1/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> RenderTableSection {TBODY} at (2,2) size 111x50
</span><span class="cx"> RenderTableRow {TR} at (0,0) size 111x50
</span><span class="cx"> RenderTableCell {TD} at (0,22) size 56x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
</span><del>- RenderTableCell {TD} at (55,23) size 56x4 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (56,23) size 55x4 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttablebordercollapsingcachedchangecellborderwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/LayoutTests/platform/mac/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -3,8 +3,8 @@
</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 113x54 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 110x50
- RenderTableRow {TR} at (0,0) size 110x50
</del><ins>+ RenderTable {TABLE} at (0,0) size 114x54 [border: (2px solid #0000FF)]
+ RenderTableSection {TBODY} at (2,2) size 111x50
+ RenderTableRow {TR} at (0,0) size 111x50
</ins><span class="cx"> RenderTableCell {TD} at (0,22) size 56x6 [border: (2px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
</span><del>- RenderTableCell {TD} at (55,23) size 56x4 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (56,23) size 55x4 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -220,4 +220,3 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/157589 fast/text-autosizing/ios/text-autosizing-after-back.html [ Pass Timeout ]
</span><span class="cx">
</span><del>-webkit.org/b/158009 fast/table/neighboring-cells-when-collapsed-border-changes.html [ Pass ImageOnlyFailure ]
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/Source/WebCore/ChangeLog 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-24 Zalan Bujtas <zalan@apple.com>
+
+ fast/table/neighboring-cells-when-collapsed-border-changes.html is flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=158009
+
+ Reviewed by David Hyatt.
+
+ RenderTable::invalidateCollapsedBorders() early returns on m_collapsedEmptyBorderIsPresent
+ which prevents us from marking neighboring cells dirty when style changes.
+ Decouple the "invalidate the collapsed borders" and the "mark the neighboring cells dirty" logic.
+
+ Covered by existing tests. (and now we agree with FF on cached-change-cell-border-width.html)
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::invalidateCollapsedBorders):
+ (WebCore::markCellDirtyWhenCollapsedBorderChanges): Deleted.
+ * rendering/RenderTableCell.cpp:
+ (WebCore::markCellDirtyWhenCollapsedBorderChanges):
+ (WebCore::RenderTableCell::styleDidChange):
+
</ins><span class="cx"> 2016-05-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix use-after-free after r201318
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -594,14 +594,6 @@
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void markCellDirtyWhenCollapsedBorderChanges(RenderTableCell* cell)
-{
- if (!cell)
- return;
- cell->invalidateHasEmptyCollapsedBorders();
- cell->setNeedsLayoutAndPrefWidthsRecalc();
-}
-
</del><span class="cx"> void RenderTable::invalidateCollapsedBorders(RenderTableCell* cellWithStyleChange)
</span><span class="cx"> {
</span><span class="cx"> m_collapsedBordersValid = false;
</span><span class="lines">@@ -616,10 +608,14 @@
</span><span class="cx"> if (cellWithStyleChange) {
</span><span class="cx"> // It is enough to invalidate just the surrounding cells when cell border style changes.
</span><span class="cx"> cellWithStyleChange->invalidateHasEmptyCollapsedBorders();
</span><del>- markCellDirtyWhenCollapsedBorderChanges(cellBelow(cellWithStyleChange));
- markCellDirtyWhenCollapsedBorderChanges(cellAbove(cellWithStyleChange));
- markCellDirtyWhenCollapsedBorderChanges(cellBefore(cellWithStyleChange));
- markCellDirtyWhenCollapsedBorderChanges(cellAfter(cellWithStyleChange));
</del><ins>+ if (auto* below = cellBelow(cellWithStyleChange))
+ below->invalidateHasEmptyCollapsedBorders();
+ if (auto* above = cellAbove(cellWithStyleChange))
+ above->invalidateHasEmptyCollapsedBorders();
+ if (auto* before = cellBefore(cellWithStyleChange))
+ before->invalidateHasEmptyCollapsedBorders();
+ if (auto* after = cellAfter(cellWithStyleChange))
+ after->invalidateHasEmptyCollapsedBorders();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (201345 => 201346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-05-24 20:01:50 UTC (rev 201345)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-05-24 20:02:31 UTC (rev 201346)
</span><span class="lines">@@ -404,6 +404,13 @@
</span><span class="cx"> return firstLineBaseline().valueOr(borderAndPaddingBefore() + contentLogicalHeight());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline void markCellDirtyWhenCollapsedBorderChanges(RenderTableCell* cell)
+{
+ if (!cell)
+ return;
+ cell->setNeedsLayoutAndPrefWidthsRecalc();
+}
+
</ins><span class="cx"> void RenderTableCell::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(style().display() == TABLE_CELL);
</span><span class="lines">@@ -422,8 +429,15 @@
</span><span class="cx">
</span><span class="cx"> // If border was changed, notify table.
</span><span class="cx"> RenderTable* table = this->table();
</span><del>- if (table && oldStyle && oldStyle->border() != style().border())
</del><ins>+ if (table && oldStyle && oldStyle->border() != style().border()) {
</ins><span class="cx"> table->invalidateCollapsedBorders(this);
</span><ins>+ if (table->collapseBorders() && diff == StyleDifferenceLayout) {
+ markCellDirtyWhenCollapsedBorderChanges(table->cellBelow(this));
+ markCellDirtyWhenCollapsedBorderChanges(table->cellAbove(this));
+ markCellDirtyWhenCollapsedBorderChanges(table->cellBefore(this));
+ markCellDirtyWhenCollapsedBorderChanges(table->cellAfter(this));
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The following rules apply for resolving conflicts and figuring out which border
</span></span></pre>
</div>
</div>
</body>
</html>