<!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>[201300] 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/201300">201300</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-05-23 15:37:52 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/201296">r201296</a>.
https://bugs.webkit.org/show_bug.cgi?id=158002
The LayoutTest added with this change is failing on mac-wk1
(Requested by ryanhaddad on #webkit).
Reverted changeset:
"Changing border color and size simultaneously fails to
repaint."
https://bugs.webkit.org/show_bug.cgi?id=157967
http://trac.webkit.org/changeset/201296
Patch by Commit Queue <commit-queue@webkit.org> on 2016-05-23</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttableneighboringcellswhencollapsedborderchangesexpectedhtml">trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttableneighboringcellswhencollapsedborderchangeshtml">trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201299 => 201300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/LayoutTests/ChangeLog 2016-05-23 22:37:52 UTC (rev 201300)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-23 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r201296.
+ https://bugs.webkit.org/show_bug.cgi?id=158002
+
+ The LayoutTest added with this change is failing on mac-wk1
+ (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Changing border color and size simultaneously fails to
+ repaint."
+ https://bugs.webkit.org/show_bug.cgi?id=157967
+ http://trac.webkit.org/changeset/201296
+
</ins><span class="cx"> 2016-05-23 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking inspector/unit-tests/heap-snapshot-collection-event.html as a flaky timeout.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttableneighboringcellswhencollapsedborderchangesexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes-expected.html (201299 => 201300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes-expected.html 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes-expected.html 2016-05-23 22:37:52 UTC (rev 201300)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that we relayout neighboring cells when collapsed border changes.</title>
-<style>
-#topCell {
- border-left-width: 150px;
- border-left-style: solid;
- border-left-color: blue;
-}
-</style>
-</head>
-<body>
-PASS if the blue border does not cover the paddin/content box of 'foo'.
-<table style="border-collapse: collapse;">
-<tr><td>foo</td><td id="topCell">bar</td></tr></table>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfasttableneighboringcellswhencollapsedborderchangeshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html (201299 => 201300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html 2016-05-23 22:37:52 UTC (rev 201300)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that we relayout neighboring cells when collapsed border changes.</title>
-<style>
-#topCell {
- border-left-width: 100px;
- border-left-style: solid;
- border-left-color: blue;
-}
-</style>
-</head>
-<body>
-PASS if the blue border does not cover the paddin/content box of 'foo'.
-<table style="border-collapse: collapse;">
-<tr><td>foo</td><td id="topCell">bar</td></tr></table>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-setTimeout(function() {
- document.getElementById('topCell').style.borderLeftWidth = "150px";
- if (window.testRunner)
- testRunner.notifyDone();
-}, 10);
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201299 => 201300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/Source/WebCore/ChangeLog 2016-05-23 22:37:52 UTC (rev 201300)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-23 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r201296.
+ https://bugs.webkit.org/show_bug.cgi?id=158002
+
+ The LayoutTest added with this change is failing on mac-wk1
+ (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Changing border color and size simultaneously fails to
+ repaint."
+ https://bugs.webkit.org/show_bug.cgi?id=157967
+ http://trac.webkit.org/changeset/201296
+
</ins><span class="cx"> 2016-05-23 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Missing/Incomplete timestamp for inline Audio player in ePub book
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (201299 => 201300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-23 22:37:52 UTC (rev 201300)
</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>
</div>
</body>
</html>