<!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>[269258] branches/safari-610-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/269258">269258</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2020-11-02 11:20:21 -0800 (Mon, 02 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Apply patch. rdar://problem/70733358</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari610branchSourceWebCoreanimationDocumentTimelinecpp">branches/safari-610-branch/Source/WebCore/animation/DocumentTimeline.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari610branchLayoutTestswebanimationstransitionrestartafterstylerecalcduringtransitionendexpectedtxt">branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend-expected.txt</a></li>
<li><a href="#branchessafari610branchLayoutTestswebanimationstransitionrestartafterstylerecalcduringtransitionendhtml">branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari610branchLayoutTestswebanimationstransitionrestartafterstylerecalcduringtransitionendexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend-expected.txt (0 => 269258)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend-expected.txt                             (rev 0)
+++ branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend-expected.txt        2020-11-02 19:20:21 UTC (rev 269258)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Forcing a style update in a transitionend event for an accelerated animation should not prevent another transition for the same property from running later.
+
</ins></span></pre></div>
<a id="branchessafari610branchLayoutTestswebanimationstransitionrestartafterstylerecalcduringtransitionendhtml"></a>
<div class="addfile"><h4>Added: branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend.html (0 => 269258)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend.html                             (rev 0)
+++ branches/safari-610-branch/LayoutTests/webanimations/transition-restart-after-style-recalc-during-transitionend.html        2020-11-02 19:20:21 UTC (rev 269258)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forcing a style update in a transitionend event for an accelerated animation should not prevent another transition for the same property from running later</title>
+<body>
+<script src="../resources/ui-helper.js"></script>
+<script src="../resources/testharness.js"></script>
+<script src="../resources/testharnessreport.js"></script>
+<script>
+
+'use strict';
+
+promise_test(async t => {
+    const target = document.body.appendChild(document.createElement("div"));
+    const animatedStyle = "transition: transform 1ms linear; transform: translateX(100px)";
+
+    // Start a transform transition.
+    getComputedStyle(target).transform;
+    target.setAttribute("style", animatedStyle);
+
+    // Wait until it completes, and in the "transitionend" event handler, force a style recalc
+    // before removing the transition style.
+    await new Promise(resolve => {
+        target.addEventListener("transitionend", event => {
+            target.getAnimations();
+            target.removeAttribute("style");
+            resolve();
+        }, { once: true });
+    });
+
+    // Wait until the accelerated animation has completed.
+    await UIHelper.ensurePresentationUpdate();
+
+    // Start another transform transition.
+    getComputedStyle(target).transform;
+    target.setAttribute("style", animatedStyle);
+
+    // Check that it starts and ends.
+    await new Promise(resolve => target.addEventListener("transitionend", resolve, { once: true }));
+}, "Forcing a style update in a transitionend event for an accelerated animation should not prevent another transition for the same property from running later.");
+
+</script>
+</body>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari610branchSourceWebCoreanimationDocumentTimelinecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-610-branch/Source/WebCore/animation/DocumentTimeline.cpp (269257 => 269258)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610-branch/Source/WebCore/animation/DocumentTimeline.cpp 2020-11-02 19:13:11 UTC (rev 269257)
+++ branches/safari-610-branch/Source/WebCore/animation/DocumentTimeline.cpp    2020-11-02 19:20:21 UTC (rev 269258)
</span><span class="lines">@@ -289,8 +289,11 @@
</span><span class="cx">     ASSERT(transition);
</span><span class="cx">     removeAnimation(*transition);
</span><span class="cx">     if (is<KeyframeEffect>(transition->effect())) {
</span><del>-        if (auto* target = downcast<KeyframeEffect>(transition->effect())->targetElementOrPseudoElement())
-            target->ensureCompletedTransitionsByProperty().set(transition->property(), transition);
</del><ins>+        if (auto* target = downcast<KeyframeEffect>(transition->effect())->targetElementOrPseudoElement()) {
+            auto property = transition->property();
+            if (target->hasRunningTransitionsForProperty(property))
+                target->ensureCompletedTransitionsByProperty().set(property, transition);
+        }
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>