Change t.step() to t.step_func() from animations/prefixed

This is a follow-up CL of [1]. It changes t.step() to t.step_func()
from animations/prefixed and address review comments from [1].

[1] https://crrev.com/c/1525789

Bug: 936364
Change-Id: Ica1d58cd903ec8429f0ceac93a3ff3f1e514082b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530358
Commit-Queue: Julie Jeongeun Kim <jkim@igalia.com>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642404}

third_party/blink/web_tests/animations/prefixed/animation-events-prefixed-01.html

@@ -41,19 +41,17 @@ document.addEventListener('webkitAnimationEnd', () => {
 });
 
 async_test(t => {
-  window.addEventListener("load", () => {
-    t.step(() => {
-      // Animation begins once we append the DOM node to the document.
-      var boxNode = document.createElement('div');
-      boxNode.id = 'box';
-      boxNode.className = 'animate';
-      document.body.appendChild(boxNode);
+  window.addEventListener("load", t.step_func(() => {
+    // Animation begins once we append the DOM node to the document.
+    var boxNode = document.createElement('div');
+    boxNode.id = 'box';
+    boxNode.className = 'animate';
+    document.body.appendChild(boxNode);
 
-      document.addEventListener('webkitAnimationIteration', () => {
-        assert_true (startEventReceived && endEventReceived);
-        t.done();
-      });
-    });
-  });
+    document.addEventListener('webkitAnimationIteration', t.step_func_done(() => {
+      assert_true(startEventReceived);
+      assert_true(endEventReceived);
+    }));
+  }));
 }, "Tests that prefixed animation events are correctly fired");
 </script>

third_party/blink/web_tests/animations/prefixed/animation-events-prefixed-02.html

@@ -55,18 +55,17 @@ document.addEventListener('animationend', () => {
 });
 
 async_test(t => {
-  window.addEventListener("load", () => {
-    t.step(() => {
-      // Animation begins once we append the DOM node to the document.
-      var boxNode = document.createElement('div');
-      boxNode.id = 'box';
-      boxNode.className = 'animate';
-      document.body.appendChild(boxNode);
-      document.addEventListener('animationiteration', () => {
-        assert_true(startEventReceived && endEventReceived && prefixedEventReceived == 0);
-        t.done();
-      });
-    });
-  });
+  window.addEventListener("load", t.step_func(() => {
+    // Animation begins once we append the DOM node to the document.
+    var boxNode = document.createElement('div');
+    boxNode.id = 'box';
+    boxNode.className = 'animate';
+    document.body.appendChild(boxNode);
+    document.addEventListener('animationiteration', t.step_func_done(() => {
+      assert_true(startEventReceived);
+      assert_true(endEventReceived);
+      assert_equals(prefixedEventReceived, 0);
+    }));
+  }));
 }, "Tests that unprefixed animation events are correctly fired when listeners are on both versions");
 </script>

third_party/blink/web_tests/animations/prefixed/animation-events-prefixed-03.html

@@ -42,15 +42,13 @@ function recordAnimationEnd() {
 }
 
 async_test(t => {
-  window.addEventListener("load", () => {
+  window.addEventListener("load", t.step_func(() => {
     const box = document.getElementById('box');
-    box.addEventListener("animationiteration", () => {
-      t.step(() => {
-        assert_true(startEventReceived && endEventReceived);
-        t.done();
-      });
-    });
-  });
+    box.addEventListener("animationiteration", t.step_func_done(() => {
+      assert_true(startEventReceived);
+      assert_true(endEventReceived);
+    }));
+  }));
 }, "Prefixed animation events should be fired with html event listeners");
 </script>
 <div id="box" onwebkitanimationstart="recordAnimationStart();"

third_party/blink/web_tests/animations/prefixed/animation-events-prefixed-04.html

@@ -6,33 +6,22 @@
 var webkitAnimationStartReceived = false;
 var webkitAnimationIterationReceived = false;
 
-document.addEventListener('animationstart', () => {
-  assert_unreached("animationstart event listener should not have been called");
-});
-
 document.addEventListener('webkitAnimationStart', () => {
   webkitAnimationStartReceived = true;
 });
 
-document.addEventListener('animationiteration', () => {
-  assert_unreached("animationiteration event listener should not have been called");
-});
-
 document.addEventListener('webkitAnimationIteration', () => {
   webkitAnimationIterationReceived = true;
 });
 
-document.addEventListener('animationend', () => {
-    assert_unreached("animationend event listener should not have been called");
-});
-
 async_test(t => {
-  document.addEventListener('webkitAnimationEnd', () => {
-    t.step(() => {
-      assert_true(webkitAnimationIterationReceived && webkitAnimationIterationReceived);
-      t.done();
-    });
-  });
+  document.addEventListener('animationstart', t.unreached_func('animationstart event listener should not have been called'));
+  document.addEventListener('animationiteration', t.unreached_func('animationiteration event listener should not have been called'));
+  document.addEventListener('animationend', t.unreached_func('animationend event listener should not have been called'));
+  document.addEventListener('webkitAnimationEnd', t.step_func_done(() => {
+    assert_true(webkitAnimationStartReceived);
+    assert_true(webkitAnimationIterationReceived);
+  }));
 
   var custom = document.createEvent('CustomEvent');
   custom.initCustomEvent('webkitAnimationStart', true, true, null);

third_party/blink/web_tests/animations/prefixed/animation-events-unprefixed-01.html

@@ -41,18 +41,16 @@ document.addEventListener('animationend', () => {
 });
 
 async_test(t => {
-  window.addEventListener("load", () => {
-    t.step(() => {
-      // Animation begins once we append the DOM node to the document.
-      var boxNode = document.createElement('div');
-      boxNode.id = 'box';
-      boxNode.className = 'animate';
-      document.body.appendChild(boxNode);
-      document.addEventListener('animationiteration', () => {
-        assert_true(startEventReceived && endEventReceived);
-        t.done();
-      });
-    });
-  });
+  window.addEventListener("load", t.step_func(() => {
+    // Animation begins once we append the DOM node to the document.
+    var boxNode = document.createElement('div');
+    boxNode.id = 'box';
+    boxNode.className = 'animate';
+    document.body.appendChild(boxNode);
+    document.addEventListener('animationiteration', t.step_func_done(() => {
+      assert_true(startEventReceived);
+      assert_true(endEventReceived);
+    }));
+  }));
 }, "Tests that unprefixed animation events are correctly fired");
 </script>

third_party/blink/web_tests/animations/prefixed/animation-events-unprefixed-02.html

@@ -41,15 +41,13 @@ function recordAnimationEnd() {
 }
 
 async_test(t => {
-  window.addEventListener("load", () => {
+  window.addEventListener("load", t.step_func(() => {
     const box = document.getElementById('box');
-    box.addEventListener("animationiteration", () => {
-      t.step(() => {
-        assert_true(startEventReceived && endEventReceived);
-        t.done();
-      });
-    });
-  });
+    box.addEventListener("animationiteration", t.step_func_done(() => {
+      assert_true(startEventReceived);
+      assert_true(endEventReceived);
+    }));
+  }));
 }, "Tests that unprefixed animation events are correctly fired when using html event listeners");
 </script>
 <div id="box" onanimationstart="recordAnimationStart();" onanimationend="recordAnimationEnd();" class="animate"></div>

third_party/blink/web_tests/animations/prefixed/animation-events-unprefixed-03.html

@@ -46,15 +46,14 @@ function recordAnimationEnd() {
 }
 
 async_test(t => {
-  window.addEventListener("load", () => {
+  window.addEventListener("load", t.step_func(() => {
     const box = document.getElementById('box');
-    box.addEventListener("animationiteration", () => {
-      t.step(() => {
-        assert_true(startEventReceived && endEventReceived && prefixedEventReceived == 0);
-        t.done();
-      });
-    });
-  });
+    box.addEventListener("animationiteration", t.step_func_done(() => {
+      assert_true(startEventReceived);
+      assert_true(endEventReceived);
+      assert_equals(prefixedEventReceived, 0);
+    }));
+  }));
 }, "Tests that unprefixed animation events are correctly fired when using html event listeners (only unprefixed should be fired)");
 </script>
 <div id="box" onwebkitanimationstart="recordPrefixedEvent();" onwebkitanimationend="recordPrefixedEvent();" onwebkitanimationiteration="recordPrefixedEvent();" onanimationstart="recordAnimationStart();" onanimationend="recordAnimationEnd();" class="animate"></div>

third_party/blink/web_tests/animations/prefixed/animation-events-unprefixed-04.html

@@ -10,29 +10,19 @@ document.addEventListener('animationstart', () => {
   animationStartReceived = true;
 });
 
-document.addEventListener('webkitAnimationStart', () => {
-  assert_unreached("webkitAnimationStart event listener should not have been called");
-});
-
 document.addEventListener('animationiteration', () => {
   animationIterationReceived = true;
 });
 
-document.addEventListener('webkitAnimationIteration', () => {
-  assert_unreached("webkitAnimationIteration event listener should not have been called");
-});
-
-document.addEventListener('webkitAnimationEnd', function(e) {
-  assert_unreached("webkitAnimationEnd event listener should not have been called");
-});
-
 async_test(t => {
-  document.addEventListener('animationend', () => {
-    t.step(() => {
-      assert_true(animationStartReceived && animationIterationReceived);
-      t.done();
-    });
-  });
+  document.addEventListener('webkitAnimationStart', t.unreached_func('webkitAnimationStart event listener should not have been called'));
+  document.addEventListener('webkitAnimationIteration', t.unreached_func('webkitAnimationIteration event listener should not have been called'));
+  document.addEventListener('webkitAnimationEnd', t.unreached_func('webkitAnimationEnd event listener should not have been called'));
+
+  document.addEventListener('animationend', t.step_func_done(() => {
+    assert_true(animationStartReceived);
+    assert_true(animationIterationReceived);
+  }));
 
   var custom = document.createEvent('CustomEvent');
   custom.initCustomEvent('animationstart', true, true, null);

third_party/blink/web_tests/animations/prefixed/animation-shorthand-prefixed.html

@@ -74,18 +74,13 @@ function start()
     for (var i=0; i < kProperties.length; i++) {
       var computedValue = elStyle[kProperties[i]];
       var expectedValue = curItem.values[i];
-      assert_true(computedValue == expectedValue);
+      assert_equals(computedValue, expectedValue);
     }
   });
 }
 
 async_test(t => {
-  window.addEventListener("load", () => {
-    t.step(() => {
-      start();
-      t.done();
-    });
-  });
+  window.addEventListener("load", t.step_func_done(start));
 }, "Test animation shorthand property prefixed");
 </script>
 <div id="a" class="box"></div>

third_party/blink/web_tests/animations/prefixed/animation-shorthand-unprefixed.html

@@ -74,18 +74,13 @@ function start()
     for (var i=0; i < kProperties.length; i++) {
       var computedValue = elStyle[kProperties[i]];
       var expectedValue = curItem.values[i];
-      assert_true(computedValue == expectedValue);
+      assert_equals(computedValue, expectedValue);
     }
   });
 }
 
 async_test(t => {
-  window.addEventListener("load", () => {
-    t.step(() => {
-      start();
-      t.done();
-    });
-  });
+  window.addEventListener("load", t.step_func_done(start));
 }, "Test animation shorthand property unprefixed");
 </script>
 <div id="a" class="box"></div>

third_party/blink/web_tests/animations/prefixed/keyframes-cssom-prefixed-02.html

@@ -19,46 +19,43 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script>
 async_test(t => {
-  window.addEventListener("load", () => {
-    t.step(() => {
-      var testContainer = document.createElement("div");
-      document.body.appendChild(testContainer);
+  window.addEventListener("load", t.step_func_done(() => {
+    var testContainer = document.createElement("div");
+    document.body.appendChild(testContainer);
 
-      testContainer.innerHTML = '<div style="width:500px;height:500px"><div id="test">hello</div></div>';
+    testContainer.innerHTML = '<div style="width:500px;height:500px"><div id="test">hello</div></div>';
 
-      e = document.getElementById('test');
-      var lastSheet = document.styleSheets[document.styleSheets.length - 1];
-      lastSheet.insertRule("@-webkit-keyframes anim { from { left: 200px; } to { left: 300px;} }", lastSheet.cssRules.length);
+    e = document.getElementById('test');
+    var lastSheet = document.styleSheets[document.styleSheets.length - 1];
+    lastSheet.insertRule("@-webkit-keyframes anim { from { left: 200px; } to { left: 300px;} }", lastSheet.cssRules.length);
 
-      var keyframeRule = lastSheet.cssRules[lastSheet.cssRules.length - 1];
-      assert_equals(keyframeRule.toString(), "[object CSSKeyframesRule]");
-      assert_equals(keyframeRule.type, 7);
-      assert_equals(keyframeRule.name, "anim");
-      assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
-      assert_equals(keyframeRule.findRule('to').cssText, "100% { left: 300px; }");
-      keyframeRule.deleteRule("from");
-      assert_equals(keyframeRule.findRule('from'), null);
-      keyframeRule.appendRule("from { left: 200px; }");
-      assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
-      assert_equals(keyframeRule.cssRules[0].toString(), "[object CSSKeyframeRule]");
-      assert_equals(keyframeRule.cssRules[0].cssText, "100% { left: 300px; }");
-      assert_equals(keyframeRule.cssRules[0].keyText, "100%");
-      assert_equals(keyframeRule.cssRules[0].style.cssText, "left: 300px;");
-      assert_equals(keyframeRule.cssRules[1].toString(), "[object CSSKeyframeRule]");
-      assert_equals(keyframeRule.cssRules[1].cssText, "0% { left: 200px; }");
-      assert_equals(keyframeRule.cssRules[1].keyText, "0%");
-      assert_equals(keyframeRule.cssRules[1].style.cssText, "left: 200px;");
+    var keyframeRule = lastSheet.cssRules[lastSheet.cssRules.length - 1];
+    assert_equals(keyframeRule.toString(), "[object CSSKeyframesRule]");
+    assert_equals(keyframeRule.type, 7);
+    assert_equals(keyframeRule.name, "anim");
+    assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
+    assert_equals(keyframeRule.findRule('to').cssText, "100% { left: 300px; }");
+    keyframeRule.deleteRule("from");
+    assert_equals(keyframeRule.findRule('from'), null);
+    keyframeRule.appendRule("from { left: 200px; }");
+    assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
+    assert_equals(keyframeRule.cssRules[0].toString(), "[object CSSKeyframeRule]");
+    assert_equals(keyframeRule.cssRules[0].cssText, "100% { left: 300px; }");
+    assert_equals(keyframeRule.cssRules[0].keyText, "100%");
+    assert_equals(keyframeRule.cssRules[0].style.cssText, "left: 300px;");
+    assert_equals(keyframeRule.cssRules[1].toString(), "[object CSSKeyframeRule]");
+    assert_equals(keyframeRule.cssRules[1].cssText, "0% { left: 200px; }");
+    assert_equals(keyframeRule.cssRules[1].keyText, "0%");
+    assert_equals(keyframeRule.cssRules[1].style.cssText, "left: 200px;");
 
-      try {
-        new CSSKeyframesRule().name;
-      } catch (e) {
-        assert_equals(e.message, "Illegal constructor");
-      }
+    try {
+      new CSSKeyframesRule().name;
+    } catch (e) {
+      assert_equals(e.message, "Illegal constructor");
+    }
 
-      document.body.removeChild(testContainer);
-      t.done();
-    });
-  });
+    document.body.removeChild(testContainer);
+  }));
 }, "Test the CSSOM of @-webkit-keyframes");
 </script>
 </body>

third_party/blink/web_tests/animations/prefixed/keyframes-cssom-unprefixed-02.html

@@ -17,45 +17,42 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script>
 async_test(t => {
-  window.addEventListener("load", () => {
-    t.step(() => {
-      var testContainer = document.createElement("div");
-      document.body.appendChild(testContainer);
+  window.addEventListener("load", t.step_func_done(() => {
+    var testContainer = document.createElement("div");
+    document.body.appendChild(testContainer);
 
-      testContainer.innerHTML = '<div style="width:500px;height:500px"><div id="test">hello</div></div>';
+    testContainer.innerHTML = '<div style="width:500px;height:500px"><div id="test">hello</div></div>';
 
-      e = document.getElementById('test');
-      var lastSheet = document.styleSheets[document.styleSheets.length - 1];
-      lastSheet.insertRule("@keyframes anim { from { left: 200px; } to { left: 300px;} }", lastSheet.cssRules.length);
+    e = document.getElementById('test');
+    var lastSheet = document.styleSheets[document.styleSheets.length - 1];
+    lastSheet.insertRule("@keyframes anim { from { left: 200px; } to { left: 300px;} }", lastSheet.cssRules.length);
 
-      var keyframeRule = lastSheet.cssRules[lastSheet.cssRules.length - 1];
-      assert_equals(keyframeRule.toString(), "[object CSSKeyframesRule]");
-      assert_equals(keyframeRule.type, 7);
-      assert_equals(keyframeRule.name, "anim");
-      assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
-      assert_equals(keyframeRule.findRule('to').cssText, "100% { left: 300px; }");
-      keyframeRule.deleteRule("from");
-      assert_equals(keyframeRule.findRule('from'), null);
-      keyframeRule.appendRule("from { left: 200px; }");
-      assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
-      assert_equals(keyframeRule.cssRules[0].toString(), "[object CSSKeyframeRule]");
-      assert_equals(keyframeRule.cssRules[0].cssText, "100% { left: 300px; }");
-      assert_equals(keyframeRule.cssRules[0].keyText, "100%");
-      assert_equals(keyframeRule.cssRules[0].style.cssText, "left: 300px;");
-      assert_equals(keyframeRule.cssRules[1].toString(), "[object CSSKeyframeRule]");
-      assert_equals(keyframeRule.cssRules[1].cssText, "0% { left: 200px; }");
-      assert_equals(keyframeRule.cssRules[1].keyText, "0%");
-      assert_equals(keyframeRule.cssRules[1].style.cssText, "left: 200px;");
+    var keyframeRule = lastSheet.cssRules[lastSheet.cssRules.length - 1];
+    assert_equals(keyframeRule.toString(), "[object CSSKeyframesRule]");
+    assert_equals(keyframeRule.type, 7);
+    assert_equals(keyframeRule.name, "anim");
+    assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
+    assert_equals(keyframeRule.findRule('to').cssText, "100% { left: 300px; }");
+    keyframeRule.deleteRule("from");
+    assert_equals(keyframeRule.findRule('from'), null);
+    keyframeRule.appendRule("from { left: 200px; }");
+    assert_equals(keyframeRule.findRule('from').cssText, "0% { left: 200px; }");
+    assert_equals(keyframeRule.cssRules[0].toString(), "[object CSSKeyframeRule]");
+    assert_equals(keyframeRule.cssRules[0].cssText, "100% { left: 300px; }");
+    assert_equals(keyframeRule.cssRules[0].keyText, "100%");
+    assert_equals(keyframeRule.cssRules[0].style.cssText, "left: 300px;");
+    assert_equals(keyframeRule.cssRules[1].toString(), "[object CSSKeyframeRule]");
+    assert_equals(keyframeRule.cssRules[1].cssText, "0% { left: 200px; }");
+    assert_equals(keyframeRule.cssRules[1].keyText, "0%");
+    assert_equals(keyframeRule.cssRules[1].style.cssText, "left: 200px;");
 
-      try {
-        new CSSKeyframesRule().name;
-      } catch (e) {
-        assert_equals(e.message, "Illegal constructor");
-      }
+    try {
+      new CSSKeyframesRule().name;
+    } catch (e) {
+      assert_equals(e.message, "Illegal constructor");
+    }
 
-      document.body.removeChild(testContainer);
-      t.done();
-    });
-  });
+    document.body.removeChild(testContainer);
+  }));
 }, "Test the CSSOM of @keyframes");
 </script>