<!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>[225345] branches/safari-604-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/225345">225345</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-11-30 13:35:47 -0800 (Thu, 30 Nov 2017)</dd>
</dl>

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari604branchLayoutTestsChangeLog">branches/safari-604-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari604branchSourceWebCoreChangeLog">branches/safari-604-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari604branchSourceWebCoreplatformCalculationValuecpp">branches/safari-604-branch/Source/WebCore/platform/CalculationValue.cpp</a></li>
<li><a href="#branchessafari604branchSourceWebCoreplatformCalculationValueh">branches/safari-604-branch/Source/WebCore/platform/CalculationValue.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari604branchLayoutTeststransitionstransitionwithcalcspinexpectedtxt">branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin-expected.txt</a></li>
<li><a href="#branchessafari604branchLayoutTeststransitionstransitionwithcalcspinhtml">branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari604branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604-branch/LayoutTests/ChangeLog (225344 => 225345)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604-branch/LayoutTests/ChangeLog 2017-11-30 21:16:22 UTC (rev 225344)
+++ branches/safari-604-branch/LayoutTests/ChangeLog    2017-11-30 21:35:47 UTC (rev 225345)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-11-30  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r225141. rdar://problem/35732184
+
+    2017-11-24  Antti Koivisto  <antti@apple.com>
+
+            Style resolution spin due to calc() values always comparing inequal (seen on arstechnica.com)
+            https://bugs.webkit.org/show_bug.cgi?id=179982
+            <rdar://problem/35677991>
+
+            Reviewed by Darin Adler.
+
+            * transitions/transition-with-calc-spin-expected.txt: Added.
+            * transitions/transition-with-calc-spin.html: Added.
+
</ins><span class="cx"> 2017-11-03  Jason Marcell  <jmarcell@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r224405. rdar://problem/35339758
</span></span></pre></div>
<a id="branchessafari604branchLayoutTeststransitionstransitionwithcalcspinexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin-expected.txt (0 => 225345)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin-expected.txt                                (rev 0)
+++ branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin-expected.txt   2017-11-30 21:35:47 UTC (rev 225345)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Test that calc values in transitions don't lead to a style resolution spin.
+PASS
+
</ins></span></pre></div>
<a id="branchessafari604branchLayoutTeststransitionstransitionwithcalcspinhtml"></a>
<div class="addfile"><h4>Added: branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin.html (0 => 225345)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin.html                                (rev 0)
+++ branches/safari-604-branch/LayoutTests/transitions/transition-with-calc-spin.html   2017-11-30 21:35:47 UTC (rev 225345)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<style>
+#testdiv {
+    background-color: inherit; /* needed to dodge the matched properties cache */
+}
+.test {
+    transition: 1s;
+    width: calc(100% - 10px); /* calc compares inequal with the same exact calc value */
+}
+</style>
+<body onload="test()">
+Test that calc values in transitions don't lead to a style resolution spin.
+<div id=log></div>
+<div id=testdiv></div>
+<script>
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
+}
+
+function test() {
+    document.body.offsetWidth;
+
+    const startStyleRecalcCount = window.internals ? internals.styleRecalcCount() : 0;
+
+    testdiv.classList.add('test');
+
+    if (!window.internals)
+        return;
+    setTimeout(() => {
+       const styleRecalcCount = internals.styleRecalcCount() - startStyleRecalcCount;
+       if (styleRecalcCount <= 3)
+           log.innerHTML = "PASS"
+       else
+           log.innerHTML = `FAIL: styleRecalcCount: ${ internals.styleRecalcCount() - startStyleRecalcCount}`;
+       testRunner.notifyDone();
+    }, 10);
+}
+</script>
+</div>
</ins></span></pre></div>
<a id="branchessafari604branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (225344 => 225345)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604-branch/Source/WebCore/ChangeLog      2017-11-30 21:16:22 UTC (rev 225344)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-11-30 21:35:47 UTC (rev 225345)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-11-30  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r225141. rdar://problem/35732184
+
+    2017-11-24  Antti Koivisto  <antti@apple.com>
+
+            Style resolution spin due to calc() values always comparing inequal (seen on arstechnica.com)
+            https://bugs.webkit.org/show_bug.cgi?id=179982
+            <rdar://problem/35677991>
+
+            Reviewed by Darin Adler.
+
+            Test: transitions/transition-with-calc-spin.html
+
+            Something like calc(100% - 10px) would compare inequal to itself. This causes the implicit animation engine think that
+            there is a new target value after style resolution and restart the transition. Starting the transition triggers another style
+            resolution on zero duration timer and so on.
+
+            * platform/CalculationValue.cpp:
+            (WebCore::operator==):
+            * platform/CalculationValue.h:
+
+            Deep compare the child vectors.
+
</ins><span class="cx"> 2017-11-03  Jason Marcell  <jmarcell@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r224405. rdar://problem/35339758
</span></span></pre></div>
<a id="branchessafari604branchSourceWebCoreplatformCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-604-branch/Source/WebCore/platform/CalculationValue.cpp (225344 => 225345)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604-branch/Source/WebCore/platform/CalculationValue.cpp  2017-11-30 21:16:22 UTC (rev 225344)
+++ branches/safari-604-branch/Source/WebCore/platform/CalculationValue.cpp     2017-11-30 21:35:47 UTC (rev 225345)
</span><span class="lines">@@ -123,6 +123,20 @@
</span><span class="cx">     return other.type() == CalcExpressionNodeOperation && *this == toCalcExpressionOperation(other);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool operator==(const CalcExpressionOperation& a, const CalcExpressionOperation& b)
+{
+    if (a.getOperator() != b.getOperator())
+        return false;
+    // Maybe Vectors of unique_ptrs should always do deep compare?
+    if (a.children().size() != b.children().size())
+        return false;
+    for (unsigned i = 0; i < a.children().size(); ++i) {
+        if (!(*a.children()[i] == *b.children()[i]))
+            return false;
+    }
+    return true;
+}
+
</ins><span class="cx"> void CalcExpressionOperation::dump(TextStream& ts) const
</span><span class="cx"> {
</span><span class="cx">     if (m_operator == CalcMin || m_operator == CalcMax) {
</span></span></pre></div>
<a id="branchessafari604branchSourceWebCoreplatformCalculationValueh"></a>
<div class="modfile"><h4>Modified: branches/safari-604-branch/Source/WebCore/platform/CalculationValue.h (225344 => 225345)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604-branch/Source/WebCore/platform/CalculationValue.h    2017-11-30 21:16:22 UTC (rev 225344)
+++ branches/safari-604-branch/Source/WebCore/platform/CalculationValue.h       2017-11-30 21:35:47 UTC (rev 225345)
</span><span class="lines">@@ -209,10 +209,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline bool operator==(const CalcExpressionOperation& a, const CalcExpressionOperation& b)
-{
-    return a.getOperator() == b.getOperator() && a.children() == b.children();
-}
</del><ins>+bool operator==(const CalcExpressionOperation&, const CalcExpressionOperation&);
</ins><span class="cx"> 
</span><span class="cx"> inline const CalcExpressionOperation& toCalcExpressionOperation(const CalcExpressionNode& value)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>