DOMWindowTimers::setTimeout and setInterval modified to accept Trusted

Types. New implementations of DOMWindowTimers::setTimeout() and setInterval() added to accept TrustedScript as an argument. Previously existing implementations renamed to setTimeoutFromString() and setIntervalFromString(), respectively. Bug: 739170 Change-Id: I3513ebb651534f0b1ef1b8de9c694136b02e2412 Reviewed-on: https://chromium-review.googlesource.com/1179899 Reviewed-by: Mike West <[email protected]> Reviewed-by: Yuki Shiino <[email protected]> Commit-Queue: Maja Kabus <[email protected]> Cr-Commit-Position: refs/heads/master@{#591327}
web-platform-tests · Sep 16, 2018 · 55cc46e · 55cc46e
1 parent 8f983f1
commit 55cc46e
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 0 deletions.
diff --git a/lint.whitelist b/lint.whitelist
@@ -208,6 +208,8 @@ SET TIMEOUT: streams/piping/general.js
 SET TIMEOUT: streams/readable-streams/cancel.js
 SET TIMEOUT: streams/resources/rs-utils.js
 SET TIMEOUT: streams/writable-streams/byte-length-queuing-strategy.js
+SET TIMEOUT: trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html
+SET TIMEOUT: trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html
 SET TIMEOUT: user-timing/*
 SET TIMEOUT: webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html
 SET TIMEOUT: webauthn/*timeout.https.html

diff --git a/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html b/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+<body>
+<script>
+  async_test(t => {
+    window.timeoutTest = t;
+    let policy = createScript_policy(window, 'timeout');
+    let script = policy.createScript("window.timeoutTest.done();");
+    setTimeout(script);
+  }, "window.setTimeout assigned via policy (successful Script transformation).");
+
+  async_test(t => {
+    window.intervalTest = t;
+    let policy = createScript_policy(window, 'script');
+    let script = policy.createScript("window.intervalTest.done();");
+    setInterval(script);
+  }, "window.setInterval assigned via policy (successful Script transformation).");
+</script>
diff --git a/...ed-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html b/...ed-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="trusted-types">
+<body>
+<script>
+  // setTimeout tests
+  // TrustedScript assignments do not throw.
+  async_test(t => {
+    window.timeoutTest = t;
+    let policy = createScript_policy(window, 'timeout');
+    let script = policy.createScript("window.timeoutTest.done();");
+    setTimeout(script);
+  }, "window.setTimeout assigned via policy (successful Script transformation).");
+
+  // String assignments throw.
+  test(t => {
+    window.timeoutTestString = t.unreached_func();
+    assert_throws(new TypeError(), _ => {
+      setTimeout("window.timeoutTestString();");
+    });
+  }, "`window.setTimeout(string)` throws.");
+
+  // Null assignment throws.
+  test(t => {
+    assert_throws(new TypeError(), _ => {
+      setTimeout(null);
+    });
+  }, "`window.setTimeout(null)` throws.");
+
+  // setInterval tests
+  // TrustedScript assignments do not throw.
+  async_test(t => {
+    window.intervalTest = t;
+    let policy = createScript_policy(window, 'script');
+    let script = policy.createScript("window.intervalTest.done();");
+    setInterval(script);
+  }, "window.setInterval assigned via policy (successful Script transformation).");
+
+  // String assignments throw.
+  test(t => {
+    window.intervalTestString = t.unreached_func();
+    assert_throws(new TypeError(), _ => {
+      setInterval("window.intervalTestString()");
+    });
+  }, "`window.setInterval(string)` throws.");
+
+  // Null assignment throws.
+  test(t => {
+    assert_throws(new TypeError(), _ => {
+      setInterval(null);
+    });
+  }, "`window.setInterval(null)` throws.");
+</script>