<!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>[260780] trunk/LayoutTests</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/260780">260780</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-27 13:56:01 -0700 (Mon, 27 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ iOS ] REGRESSION: animations/change-keyframes-name.html is a flaky failure
https://bugs.webkit.org/show_bug.cgi?id=211079
<rdar://problem/61486093>

Reviewed by Simon Fraser.

Rewrite this test to use the new AnimationTest helper that will non-flakily check animated values while an animation is running.

* animations/change-keyframes-name-expected.txt:
* animations/change-keyframes-name.html:
* animations/resources/animation-test.js:
(AnimationTest.prototype.async recordValueAfterRunningFor):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsanimationschangekeyframesnameexpectedtxt">trunk/LayoutTests/animations/change-keyframes-name-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationschangekeyframesnamehtml">trunk/LayoutTests/animations/change-keyframes-name.html</a></li>
<li><a href="#trunkLayoutTestsanimationsresourcesanimationtestjs">trunk/LayoutTests/animations/resources/animation-test.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (260779 => 260780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2020-04-27 20:54:53 UTC (rev 260779)
+++ trunk/LayoutTests/ChangeLog 2020-04-27 20:56:01 UTC (rev 260780)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2020-04-27  Antoine Quint  <graouts@apple.com>
+
+        [ iOS ] REGRESSION: animations/change-keyframes-name.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=211079
+        <rdar://problem/61486093>
+
+        Reviewed by Simon Fraser.
+
+        Rewrite this test to use the new AnimationTest helper that will non-flakily check animated values while an animation is running.
+
+        * animations/change-keyframes-name-expected.txt:
+        * animations/change-keyframes-name.html:
+        * animations/resources/animation-test.js:
+        (AnimationTest.prototype.async recordValueAfterRunningFor):
+
</ins><span class="cx"> 2020-04-27  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Temporarily skip GL_DEPTH_COMPONENT32_OES requirement for depth textures on iOS
</span></span></pre></div>
<a id="trunkLayoutTestsanimationschangekeyframesnameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/change-keyframes-name-expected.txt (260779 => 260780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/change-keyframes-name-expected.txt  2020-04-27 20:54:53 UTC (rev 260779)
+++ trunk/LayoutTests/animations/change-keyframes-name-expected.txt     2020-04-27 20:56:01 UTC (rev 260780)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-This test starts by making sure the animation is not running, because the animation-name and the name of they @keyframes rule do not match. Then it changes the name of the @keyframes rule so they match and makes sure the animation is now running.
-PASS: animation is not running
-PASS - "left" property for "box" element at 0.25s saw something close to: 200
</del><span class="cx"> 
</span><ins>+PASS Test that dynamically changing the name of a @keyframes rule starts animations using that name. 
+
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationschangekeyframesnamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/change-keyframes-name.html (260779 => 260780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/change-keyframes-name.html  2020-04-27 20:54:53 UTC (rev 260779)
+++ trunk/LayoutTests/animations/change-keyframes-name.html     2020-04-27 20:56:01 UTC (rev 260780)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><del>-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
</del><ins>+<!DOCTYPE html>
</ins><span class="cx"> 
</span><span class="cx"> <html lang="en">
</span><span class="cx"> <head>
</span><span class="lines">@@ -13,9 +12,10 @@
</span><span class="cx">         height: 100px;
</span><span class="cx">         width: 100px;
</span><span class="cx">         background-color: blue;
</span><del>-        -webkit-animation-duration: 0.5s;
-        -webkit-animation-timing-function: linear;
-        -webkit-animation-name: "bar";
</del><ins>+        animation-duration: 0.5s;
+        animation-timing-function: linear;
+        animation-repeat-count: infinite;
+        animation-name: "bar";
</ins><span class="cx">     }
</span><span class="cx">     @-webkit-keyframes "foo" {
</span><span class="cx">         from { left: 100px; }
</span><span class="lines">@@ -24,13 +24,13 @@
</span><span class="cx">         to   { left: 300px; }
</span><span class="cx">     }
</span><span class="cx">     </style>
</span><del>-    <script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
</del><ins>+    <script src="../resources/testharness.js"></script>
+       <script src="../resources/testharnessreport.js"></script>
+       <script src="resources/animation-test.js"></script>
+</head>
+<body>
+<div id="box"></div>
</ins><span class="cx">     <script type="text/javascript" charset="utf-8">
</span><del>-    
-    const expectedValues = [
-      // [animation-name, time, element-id, property, expected-value, tolerance]
-      [null, 0.25, "box", "left", 200, 20],
-    ];
</del><span class="cx"> 
</span><span class="cx">     function findKeyframesRule(rule)
</span><span class="cx">     {
</span><span class="lines">@@ -41,45 +41,43 @@
</span><span class="cx">                     return ss[i].cssRules[j];
</span><span class="cx">             }
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         return null;
</span><span class="cx">     }
</span><del>-        
-    function change()
-    {
-        // change keyframes name
-        var keyframes = findKeyframesRule("foo");
-        keyframes.name = "anim";
-        document.getElementById('box').style.webkitAnimationName = "anim";
</del><span class="cx"> 
</span><del>-        runAnimationTest(expectedValues);
-    }
</del><ins>+    async_test(async t => {
+        const delay = 100;
+        const box = document.getElementById("box");
+        const previousAnimationName = "foo";
+        const newAnimationName = "anim";
+
+        const test = new AnimationTest({
+            target: box,
+            styleExtractor: style => parseFloat(style.left)
+        });
+
+        // First, ensure that there is no animation running.
+        assert_true(!test.animation, "There is no animation initially.");
+
+        // Now, rename "@keyframes foo" to allow an animation to start.
+        findKeyframesRule(previousAnimationName).name = newAnimationName;
+        box.style.animationName = newAnimationName;
+
+        // There should be a running animation now.
+        assert_true(test.animation instanceof CSSAnimation, "There is an animation after changing the @keyframes rule.");
+
+        // Record two computed values after the specified delay each and ensure they're not the same,
+        // showing animated values are applied.
+        const initialValue = await test.recordValueAfterRunningFor(delay);
+        const currentValue = await test.recordValueAfterRunningFor(delay);
+        assert_not_equals(initialValue, currentValue, "Values recorded while running aren't the same.");
+
+        // Now, check the recorded values were correct.
+        test.checkRecordedValues();
+
+        t.done();
+    }, `Test that dynamically changing the name of a @keyframes rule starts animations using that name.`);
</ins><span class="cx">     
</span><del>-    function setup()
-    {
-        if (window.testRunner) {
-          testRunner.dumpAsText();
-          var box = document.getElementById('box');
-          if (internals.pauseAnimationAtTimeOnElement("bar", 0.5, box))
-              document.getElementById("pre-result").innerHTML = "FAIL: animation is running";
-          else
-              document.getElementById("pre-result").innerHTML = "PASS: animation is not running";
-        }
-        
-        setTimeout(change, 200);
-    }
-    
</del><span class="cx">   </script>
</span><del>-</head>
-<body onload="setup()">
-This test starts by making sure the animation is not running, because the animation-name and the
-name of they @keyframes rule do not match. Then it changes the name of the @keyframes rule so they 
-match and makes sure the animation is now running.
-<div id="box">
-</div>
-<div id="pre-result">
-</div>
-<div id="result">
-</div>
</del><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsresourcesanimationtestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/resources/animation-test.js (260779 => 260780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/resources/animation-test.js 2020-04-27 20:54:53 UTC (rev 260779)
+++ trunk/LayoutTests/animations/resources/animation-test.js    2020-04-27 20:56:01 UTC (rev 260780)
</span><span class="lines">@@ -72,10 +72,13 @@
</span><span class="cx">         const targetTime = animation.currentTime + delay;
</span><span class="cx">         await this._tickUntil(elapsedTime => animation.currentTime >= targetTime);
</span><span class="cx"> 
</span><ins>+        const value = this.value;
</ins><span class="cx">         this._records.push({
</span><span class="cx">             currentTime: animation.currentTime,
</span><del>-            value: this.value
</del><ins>+            value: value
</ins><span class="cx">         });
</span><ins>+
+        return value;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Check that all requested values recorded using recordValueAfterRunningFor() match the same values
</span></span></pre>
</div>
</div>

</body>
</html>