From 3849cc1b369c9eccdd13c7a52d0824f0fb2e505c Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Wed, 2 Sep 2020 14:07:31 +0200
Subject: [PATCH] Add more tests for img element

---
 .../document-write/img-data-src.html          | 25 +++++++++
 .../document-write/img-src-crossorigin.html   | 25 +++++++++
 .../document-write/img-src-loading-lazy.html  | 25 +++++++++
 .../img-src-referrerpolicy-no-referrer.html   | 25 +++++++++
 .../generated/document-write/img-src.html     |  2 +-
 .../generated/document-write/img-srcset.html  | 25 +++++++++
 .../document-write/picture-source-br-img.html |  2 +-
 .../document-write/picture-source-no-img.html |  2 +-
 .../picture-source-nomatch-media.html         |  2 +-
 .../picture-source-unsupported-type.html      |  2 +-
 .../document-write/script-src-async.html      |  2 +-
 .../script-src-crossorigin.html               |  2 +-
 .../document-write/script-src-defer.html      |  2 +-
 .../document-write/script-src-integrity.html  |  2 +-
 .../document-write/script-src-module.html     |  2 +-
 .../document-write/script-src-nomodule.html   |  2 +-
 ...script-src-referrerpolicy-no-referrer.html |  2 +-
 ...cript-src-type-application-ecmascript.html |  2 +-
 .../script-src-unsupported-type.html          |  2 +-
 .../generated/document-write/script-src.html  |  2 +-
 .../generated/page-load/img-data-src.html     | 21 ++++++++
 .../page-load/img-src-crossorigin.html        | 21 ++++++++
 .../page-load/img-src-loading-lazy.html       | 21 ++++++++
 .../img-src-referrerpolicy-no-referrer.html   | 21 ++++++++
 .../generated/page-load/img-src.html          |  2 +-
 .../generated/page-load/img-srcset.html       | 21 ++++++++
 .../page-load/picture-source-br-img.html      |  2 +-
 .../page-load/picture-source-no-img.html      |  2 +-
 .../picture-source-nomatch-media.html         |  2 +-
 .../picture-source-unsupported-type.html      |  2 +-
 .../resources/img-data-src-framed.sub.html    | 12 +++++
 .../img-src-crossorigin-framed.sub.html       | 12 +++++
 .../img-src-loading-lazy-framed.sub.html      | 12 +++++
 ...referrerpolicy-no-referrer-framed.sub.html | 12 +++++
 .../resources/img-srcset-framed.sub.html      | 12 +++++
 .../generated/page-load/script-src-async.html |  2 +-
 .../page-load/script-src-crossorigin.html     |  2 +-
 .../generated/page-load/script-src-defer.html |  2 +-
 .../page-load/script-src-integrity.html       |  2 +-
 .../page-load/script-src-module.html          |  2 +-
 .../page-load/script-src-nomodule.html        |  2 +-
 ...script-src-referrerpolicy-no-referrer.html |  2 +-
 ...cript-src-type-application-ecmascript.html |  2 +-
 .../script-src-unsupported-type.html          |  2 +-
 .../generated/page-load/script-src.html       |  2 +-
 .../img-data-src-nonspeculative.sub.html      | 10 ++++
 ...mg-src-crossorigin-nonspeculative.sub.html | 10 ++++
 ...policy-no-referrer-nonspeculative.sub.html | 10 ++++
 .../img-srcset-nonspeculative.sub.html        | 10 ++++
 .../resources/preload-scanner-util.js         |  8 +--
 .../tools/generate.py                         | 52 +++++++++++--------
 51 files changed, 393 insertions(+), 57 deletions(-)
 create mode 100644 html/syntax/preload-scanner.tentative/generated/document-write/img-data-src.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/document-write/img-src-crossorigin.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/document-write/img-src-loading-lazy.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/document-write/img-src-referrerpolicy-no-referrer.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/document-write/img-srcset.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/img-data-src.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/img-src-crossorigin.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/img-src-loading-lazy.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/img-src-referrerpolicy-no-referrer.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/img-srcset.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/resources/img-data-src-framed.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-crossorigin-framed.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-loading-lazy-framed.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/page-load/resources/img-srcset-framed.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/resources/img-data-src-nonspeculative.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/resources/img-src-crossorigin-nonspeculative.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html
 create mode 100644 html/syntax/preload-scanner.tentative/generated/resources/img-srcset-nonspeculative.sub.html

diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/img-data-src.html b/html/syntax/preload-scanner.tentative/generated/document-write/img-data-src.html
new file mode 100644
index 00000000000000..8f4c815fe16974
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/img-data-src.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, document.write(): img-data-src</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  expect_fetched_onload(uuid, false)
+    .then(compare_with_nonspeculative(uuid, 'img-data-src', true))
+    .then(done);
+  document.write(`
+    <script src=/common/slow.py><\/script>
+    <script>
+     document.write('<plaintext>');
+    <\/script>
+    speculative case in document.write
+    <img data-src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid=${uuid}>
+  `);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/img-src-crossorigin.html b/html/syntax/preload-scanner.tentative/generated/document-write/img-src-crossorigin.html
new file mode 100644
index 00000000000000..e3b1fa7e17b1eb
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/img-src-crossorigin.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, document.write(): img-src-crossorigin</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  expect_fetched_onload(uuid, true)
+    .then(compare_with_nonspeculative(uuid, 'img-src-crossorigin', true))
+    .then(done);
+  document.write(`
+    <script src=/common/slow.py><\/script>
+    <script>
+     document.write('<plaintext>');
+    <\/script>
+    speculative case in document.write
+    <img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid=${uuid} crossorigin>
+  `);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/img-src-loading-lazy.html b/html/syntax/preload-scanner.tentative/generated/document-write/img-src-loading-lazy.html
new file mode 100644
index 00000000000000..22e92295ba57cb
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/img-src-loading-lazy.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, document.write(): img-src-loading-lazy</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  expect_fetched_onload(uuid, false)
+    .then(compare_with_nonspeculative(uuid, 'img-src-loading-lazy', false))
+    .then(done);
+  document.write(`
+    <script src=/common/slow.py><\/script>
+    <script>
+     document.write('<plaintext>');
+    <\/script>
+    speculative case in document.write
+    <img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid=${uuid} loading=lazy>
+  `);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/img-src-referrerpolicy-no-referrer.html b/html/syntax/preload-scanner.tentative/generated/document-write/img-src-referrerpolicy-no-referrer.html
new file mode 100644
index 00000000000000..b719642d5685d0
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/img-src-referrerpolicy-no-referrer.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, document.write(): img-src-referrerpolicy-no-referrer</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  expect_fetched_onload(uuid, true)
+    .then(compare_with_nonspeculative(uuid, 'img-src-referrerpolicy-no-referrer', true))
+    .then(done);
+  document.write(`
+    <script src=/common/slow.py><\/script>
+    <script>
+     document.write('<plaintext>');
+    <\/script>
+    speculative case in document.write
+    <img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid=${uuid} referrerpolicy=no-referrer>
+  `);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/img-src.html b/html/syntax/preload-scanner.tentative/generated/document-write/img-src.html
index 4a13dcfc575d92..e29b540cb55332 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/img-src.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/img-src.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'img-src'))
+    .then(compare_with_nonspeculative(uuid, 'img-src', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/img-srcset.html b/html/syntax/preload-scanner.tentative/generated/document-write/img-srcset.html
new file mode 100644
index 00000000000000..66e9077166514c
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/img-srcset.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, document.write(): img-srcset</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  expect_fetched_onload(uuid, true)
+    .then(compare_with_nonspeculative(uuid, 'img-srcset', true))
+    .then(done);
+  document.write(`
+    <script src=/common/slow.py><\/script>
+    <script>
+     document.write('<plaintext>');
+    <\/script>
+    speculative case in document.write
+    <img srcset=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid=${uuid}>
+  `);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-br-img.html b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-br-img.html
index eb9ef50a3dd120..b85355e2e5faea 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-br-img.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-br-img.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-br-img'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-br-img', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-no-img.html b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-no-img.html
index c6356e53ee02ca..3c223cdfa800e3 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-no-img.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-no-img.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-no-img'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-no-img', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-nomatch-media.html b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-nomatch-media.html
index 8882eea4a3212e..ca1ee53122b048 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-nomatch-media.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-nomatch-media.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-nomatch-media'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-nomatch-media', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-unsupported-type.html b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-unsupported-type.html
index f5442a3f2fc4b4..dabcb34e8ead1a 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-unsupported-type.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/picture-source-unsupported-type.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-unsupported-type'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-unsupported-type', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-async.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-async.html
index 0a6380b6fee573..e95f3e99ecedf5 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-async.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-async.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-async'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-async', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-crossorigin.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-crossorigin.html
index 33e80c93b12038..37b6b36c505d59 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-crossorigin.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-crossorigin.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-crossorigin'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-crossorigin', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-defer.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-defer.html
index ec4c7a691f751d..e2a4a991f55320 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-defer.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-defer.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-defer'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-defer', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-integrity.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-integrity.html
index 9a6664ae3b1cd1..7623d37dbc5c0b 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-integrity.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-integrity.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-integrity'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-integrity', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-module.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-module.html
index a963c80a3d58d4..1f1ddc1c18a37d 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-module.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-module.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-module'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-module', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-nomodule.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-nomodule.html
index 3b2cf485525a63..e17df52de27cb6 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-nomodule.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-nomodule.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'script-src-nomodule'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-nomodule', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-referrerpolicy-no-referrer.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-referrerpolicy-no-referrer.html
index 4be7360ab200c9..d3755dcbfc5609 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-referrerpolicy-no-referrer.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-referrerpolicy-no-referrer.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-referrerpolicy-no-referrer'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-referrerpolicy-no-referrer', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-type-application-ecmascript.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-type-application-ecmascript.html
index 1160b0b01ffdb0..aa7397f9106410 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-type-application-ecmascript.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-type-application-ecmascript.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-type-application-ecmascript'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-type-application-ecmascript', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-unsupported-type.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-unsupported-type.html
index 8cfdc89886f8b6..0c578907a4edcd 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src-unsupported-type.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src-unsupported-type.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'script-src-unsupported-type'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-unsupported-type', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/document-write/script-src.html b/html/syntax/preload-scanner.tentative/generated/document-write/script-src.html
index a150157bdc38be..d383db1bf2c457 100644
--- a/html/syntax/preload-scanner.tentative/generated/document-write/script-src.html
+++ b/html/syntax/preload-scanner.tentative/generated/document-write/script-src.html
@@ -12,7 +12,7 @@
   setup({single_test: true});
   const uuid = token();
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src'))
+    .then(compare_with_nonspeculative(uuid, 'script-src', true))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/img-data-src.html b/html/syntax/preload-scanner.tentative/generated/page-load/img-data-src.html
new file mode 100644
index 00000000000000..9c620fb1010fe5
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/img-data-src.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load: img-data-src</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<body>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  const iframe = document.createElement('iframe');
+  iframe.src = `resources/img-data-src-framed.sub.html?uuid=${uuid}`;
+  document.body.appendChild(iframe);
+  expect_fetched_onload(uuid, false)
+    .then(compare_with_nonspeculative(uuid, 'img-data-src', true))
+    .then(done);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/img-src-crossorigin.html b/html/syntax/preload-scanner.tentative/generated/page-load/img-src-crossorigin.html
new file mode 100644
index 00000000000000..e8b5dcb14090f2
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/img-src-crossorigin.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load: img-src-crossorigin</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<body>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  const iframe = document.createElement('iframe');
+  iframe.src = `resources/img-src-crossorigin-framed.sub.html?uuid=${uuid}`;
+  document.body.appendChild(iframe);
+  expect_fetched_onload(uuid, true)
+    .then(compare_with_nonspeculative(uuid, 'img-src-crossorigin', true))
+    .then(done);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/img-src-loading-lazy.html b/html/syntax/preload-scanner.tentative/generated/page-load/img-src-loading-lazy.html
new file mode 100644
index 00000000000000..3a4d615a0bb535
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/img-src-loading-lazy.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load: img-src-loading-lazy</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<body>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  const iframe = document.createElement('iframe');
+  iframe.src = `resources/img-src-loading-lazy-framed.sub.html?uuid=${uuid}`;
+  document.body.appendChild(iframe);
+  expect_fetched_onload(uuid, false)
+    .then(compare_with_nonspeculative(uuid, 'img-src-loading-lazy', false))
+    .then(done);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/img-src-referrerpolicy-no-referrer.html b/html/syntax/preload-scanner.tentative/generated/page-load/img-src-referrerpolicy-no-referrer.html
new file mode 100644
index 00000000000000..f65034972dc124
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/img-src-referrerpolicy-no-referrer.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load: img-src-referrerpolicy-no-referrer</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<body>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  const iframe = document.createElement('iframe');
+  iframe.src = `resources/img-src-referrerpolicy-no-referrer-framed.sub.html?uuid=${uuid}`;
+  document.body.appendChild(iframe);
+  expect_fetched_onload(uuid, true)
+    .then(compare_with_nonspeculative(uuid, 'img-src-referrerpolicy-no-referrer', true))
+    .then(done);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/img-src.html b/html/syntax/preload-scanner.tentative/generated/page-load/img-src.html
index fb5f140a23bb27..3530a32024767f 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/img-src.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/img-src.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/img-src-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'img-src'))
+    .then(compare_with_nonspeculative(uuid, 'img-src', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/img-srcset.html b/html/syntax/preload-scanner.tentative/generated/page-load/img-srcset.html
new file mode 100644
index 00000000000000..eb0de2a078c607
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/img-srcset.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load: img-srcset</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
+<script src=/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js></script>
+<body>
+<script>
+  setup({single_test: true});
+  const uuid = token();
+  const iframe = document.createElement('iframe');
+  iframe.src = `resources/img-srcset-framed.sub.html?uuid=${uuid}`;
+  document.body.appendChild(iframe);
+  expect_fetched_onload(uuid, true)
+    .then(compare_with_nonspeculative(uuid, 'img-srcset', true))
+    .then(done);
+</script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-br-img.html b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-br-img.html
index 0fa7e52a8897de..5ba0828c2f16d6 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-br-img.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-br-img.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/picture-source-br-img-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-br-img'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-br-img', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-no-img.html b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-no-img.html
index 36a28341d2c4b6..b625e9186bf67a 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-no-img.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-no-img.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/picture-source-no-img-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-no-img'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-no-img', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-nomatch-media.html b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-nomatch-media.html
index 20c52c4f22d63a..90ae9bb470a7f0 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-nomatch-media.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-nomatch-media.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/picture-source-nomatch-media-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-nomatch-media'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-nomatch-media', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-unsupported-type.html b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-unsupported-type.html
index a46e79fff51754..f2ed5d43ea925b 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-unsupported-type.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/picture-source-unsupported-type.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/picture-source-unsupported-type-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'picture-source-unsupported-type'))
+    .then(compare_with_nonspeculative(uuid, 'picture-source-unsupported-type', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-data-src-framed.sub.html b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-data-src-framed.sub.html
new file mode 100644
index 00000000000000..d961ab40164865
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-data-src-framed.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load (helper file): img-data-src</title>
+<script src=/common/slow.py></script>
+<script>
+  document.write('<plaintext>');
+</script>
+speculative case
+<img data-src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}}>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-crossorigin-framed.sub.html b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-crossorigin-framed.sub.html
new file mode 100644
index 00000000000000..2809ae9008fc4c
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-crossorigin-framed.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load (helper file): img-src-crossorigin</title>
+<script src=/common/slow.py></script>
+<script>
+  document.write('<plaintext>');
+</script>
+speculative case
+<img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}} crossorigin>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-loading-lazy-framed.sub.html b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-loading-lazy-framed.sub.html
new file mode 100644
index 00000000000000..f269ea94c947fd
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-loading-lazy-framed.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load (helper file): img-src-loading-lazy</title>
+<script src=/common/slow.py></script>
+<script>
+  document.write('<plaintext>');
+</script>
+speculative case
+<img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}} loading=lazy>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html
new file mode 100644
index 00000000000000..2ba14904808a0b
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load (helper file): img-src-referrerpolicy-no-referrer</title>
+<script src=/common/slow.py></script>
+<script>
+  document.write('<plaintext>');
+</script>
+speculative case
+<img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}} referrerpolicy=no-referrer>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-srcset-framed.sub.html b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-srcset-framed.sub.html
new file mode 100644
index 00000000000000..2f3e98dac53488
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/resources/img-srcset-framed.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, page load (helper file): img-srcset</title>
+<script src=/common/slow.py></script>
+<script>
+  document.write('<plaintext>');
+</script>
+speculative case
+<img srcset=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}}>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-async.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-async.html
index abde80e3462f0d..d336918280c18d 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-async.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-async.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-async-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-async'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-async', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-crossorigin.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-crossorigin.html
index bf097024dcd137..37e794771fec36 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-crossorigin.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-crossorigin.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-crossorigin-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-crossorigin'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-crossorigin', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-defer.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-defer.html
index 6de01a9aa8257e..0128760251ced9 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-defer.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-defer.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-defer-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-defer'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-defer', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-integrity.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-integrity.html
index ff9c7efd2ddce4..0271b6096ea73c 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-integrity.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-integrity.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-integrity-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-integrity'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-integrity', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-module.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-module.html
index 4869c16a3ac515..0aac2eda3df499 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-module.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-module.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-module-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-module'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-module', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-nomodule.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-nomodule.html
index b9e340b534ce78..ffcc12d54d9ef3 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-nomodule.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-nomodule.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-nomodule-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'script-src-nomodule'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-nomodule', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-referrerpolicy-no-referrer.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-referrerpolicy-no-referrer.html
index 8b2efd6d9bc6ee..7e979071788cef 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-referrerpolicy-no-referrer.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-referrerpolicy-no-referrer.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-referrerpolicy-no-referrer-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-referrerpolicy-no-referrer'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-referrerpolicy-no-referrer', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-type-application-ecmascript.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-type-application-ecmascript.html
index e2b66d8e9b834f..497daad6a16cde 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-type-application-ecmascript.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-type-application-ecmascript.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-type-application-ecmascript-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src-type-application-ecmascript'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-type-application-ecmascript', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-unsupported-type.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-unsupported-type.html
index 8853f2eca17345..781c6bfe205bd1 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src-unsupported-type.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src-unsupported-type.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-unsupported-type-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, false)
-    .then(compare_with_nonspeculative(uuid, 'script-src-unsupported-type'))
+    .then(compare_with_nonspeculative(uuid, 'script-src-unsupported-type', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/page-load/script-src.html b/html/syntax/preload-scanner.tentative/generated/page-load/script-src.html
index 13b4b5537f3bf5..aa1a16cdfff45c 100644
--- a/html/syntax/preload-scanner.tentative/generated/page-load/script-src.html
+++ b/html/syntax/preload-scanner.tentative/generated/page-load/script-src.html
@@ -16,6 +16,6 @@
   iframe.src = `resources/script-src-framed.sub.html?uuid=${uuid}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, true)
-    .then(compare_with_nonspeculative(uuid, 'script-src'))
+    .then(compare_with_nonspeculative(uuid, 'script-src', true))
     .then(done);
 </script>
diff --git a/html/syntax/preload-scanner.tentative/generated/resources/img-data-src-nonspeculative.sub.html b/html/syntax/preload-scanner.tentative/generated/resources/img-data-src-nonspeculative.sub.html
new file mode 100644
index 00000000000000..39d8e87790b117
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/resources/img-data-src-nonspeculative.sub.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, non-speculative (helper file): img-data-src</title>
+non-speculative case
+<img data-src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}}>
+<!-- block the load event for a bit: -->
+<script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/resources/img-src-crossorigin-nonspeculative.sub.html b/html/syntax/preload-scanner.tentative/generated/resources/img-src-crossorigin-nonspeculative.sub.html
new file mode 100644
index 00000000000000..e8cc370128bd57
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/resources/img-src-crossorigin-nonspeculative.sub.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, non-speculative (helper file): img-src-crossorigin</title>
+non-speculative case
+<img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}} crossorigin>
+<!-- block the load event for a bit: -->
+<script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html b/html/syntax/preload-scanner.tentative/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html
new file mode 100644
index 00000000000000..c7be2a4d7895c8
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, non-speculative (helper file): img-src-referrerpolicy-no-referrer</title>
+non-speculative case
+<img src=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}} referrerpolicy=no-referrer>
+<!-- block the load event for a bit: -->
+<script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/generated/resources/img-srcset-nonspeculative.sub.html b/html/syntax/preload-scanner.tentative/generated/resources/img-srcset-nonspeculative.sub.html
new file mode 100644
index 00000000000000..b442467842d49b
--- /dev/null
+++ b/html/syntax/preload-scanner.tentative/generated/resources/img-srcset-nonspeculative.sub.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<!-- DO NOT EDIT. This file has been generated. Source:
+     /html/syntax/preload-scanner.tentative/tools/generate.py
+-->
+<title>Preload scanner, non-speculative (helper file): img-srcset</title>
+non-speculative case
+<img srcset=/html/syntax/preload-scanner.tentative/resources/stash.py?action=put&uuid={{GET[uuid]}}>
+<!-- block the load event for a bit: -->
+<script src=/common/slow.py><\/script>
diff --git a/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js b/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js
index a960d333287b03..9d3595c5d60cbd 100644
--- a/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js
+++ b/html/syntax/preload-scanner.tentative/resources/preload-scanner-util.js
@@ -12,12 +12,12 @@ function expect_fetched_onload(uuid, expectation, test_markup) {
   });
 }
 
-function compare_with_nonspeculative(uuid, title) {
+function compare_with_nonspeculative(uuid, title, test_nonspeculative) {
   return function(speculative_result) {
+    if (!test_nonspeculative) {
+      return new Promise(resolve => resolve());
+    }
     return new Promise(resolve => {
-      if (speculative_result === '') {
-        resolve(); // Nothing to compare
-      }
       const iframe = document.createElement('iframe');
       iframe.onload = resolve;
       iframe.src = `/html/syntax/preload-scanner.tentative/generated/resources/${title}-nonspeculative.sub.html?uuid=${uuid}`;
diff --git a/html/syntax/preload-scanner.tentative/tools/generate.py b/html/syntax/preload-scanner.tentative/tools/generate.py
index 6f255a0da26911..49d638d65dec2b 100755
--- a/html/syntax/preload-scanner.tentative/tools/generate.py
+++ b/html/syntax/preload-scanner.tentative/tools/generate.py
@@ -23,22 +23,27 @@
 # Test data
 
 tests = [
-    # title, template_testcase_markup, expect_load
-    (u'script-src', u'<script src={}></script>', u'true'),
-    (u'script-src-unsupported-type', u'<script src={} type=text/plain></script>', u'false'),
-    (u'script-src-type-application-ecmascript', u'<script src={} type=application/ecmascript></script>', u'true'),
-    (u'script-src-nomodule', u'<script src={} nomodule></script>', u'false'),
-    (u'script-src-module', u'<script src={} type=module></script>', u'true'),
-    (u'script-src-async', u'<script src={} async></script>', u'true'),
-    (u'script-src-defer', u'<script src={} defer></script>', u'true'),
-    (u'script-src-crossorigin', u'<script src={} crossorigin></script>', u'true'),
-    (u'script-src-integrity', u'<script src={} integrity="sha384-OLBgp1GsljhM2TJ+sbHjaiH9txEUvgdDTAzHv2P24donTt6/529l+9Ua0vFImLlb"></script>', u'true'),
-    (u'script-src-referrerpolicy-no-referrer', u'<script src={} referrerpolicy=no-referrer></script>', u'true'),
-    (u'img-src', u'<img src={}>', u'true'),
-    (u'picture-source-unsupported-type', u'<picture><source srcset={} type=text/plain><img></picture>', u'false'),
-    (u'picture-source-nomatch-media', u'<picture><source srcset={} media="not all"><img></picture>', u'false'),
-    (u'picture-source-no-img', u'<picture><source srcset={}></picture>', u'false'),
-    (u'picture-source-br-img', u'<picture><source srcset={}><br><img></picture>', u'true'),
+    # title, template_testcase_markup, expect_load, test_nonspeculative
+    (u'script-src', u'<script src={}></script>', u'true', u'true'),
+    (u'script-src-unsupported-type', u'<script src={} type=text/plain></script>', u'false', u'true'),
+    (u'script-src-type-application-ecmascript', u'<script src={} type=application/ecmascript></script>', u'true', u'true'),
+    (u'script-src-nomodule', u'<script src={} nomodule></script>', u'false', u'true'),
+    (u'script-src-module', u'<script src={} type=module></script>', u'true', u'true'),
+    (u'script-src-async', u'<script src={} async></script>', u'true', u'true'),
+    (u'script-src-defer', u'<script src={} defer></script>', u'true', u'true'),
+    (u'script-src-crossorigin', u'<script src={} crossorigin></script>', u'true', u'true'),
+    (u'script-src-integrity', u'<script src={} integrity="sha384-OLBgp1GsljhM2TJ+sbHjaiH9txEUvgdDTAzHv2P24donTt6/529l+9Ua0vFImLlb"></script>', u'true', u'true'),
+    (u'script-src-referrerpolicy-no-referrer', u'<script src={} referrerpolicy=no-referrer></script>', u'true', u'true'),
+    (u'img-src', u'<img src={}>', u'true', u'true'),
+    (u'img-data-src', u'<img data-src={}>', u'false', u'true'),
+    (u'img-srcset', u'<img srcset={}>', u'true', u'true'),
+    (u'img-src-crossorigin', u'<img src={} crossorigin>', u'true', u'true'),
+    (u'img-src-referrerpolicy-no-referrer', u'<img src={} referrerpolicy=no-referrer>', u'true', u'true'),
+    (u'img-src-loading-lazy', u'<img src={} loading=lazy>', u'false', u'false'),
+    (u'picture-source-unsupported-type', u'<picture><source srcset={} type=text/plain><img></picture>', u'false', u'true'),
+    (u'picture-source-nomatch-media', u'<picture><source srcset={} media="not all"><img></picture>', u'false', u'true'),
+    (u'picture-source-no-img', u'<picture><source srcset={}></picture>', u'false', u'true'),
+    (u'picture-source-br-img', u'<picture><source srcset={}><br><img></picture>', u'true', u'true'),
 ]
 
 preamble = u"""<!DOCTYPE html>
@@ -79,7 +84,7 @@
   iframe.src = `resources/{title}-framed.sub.html?uuid=${{uuid}}`;
   document.body.appendChild(iframe);
   expect_fetched_onload(uuid, {expect_load})
-    .then(compare_with_nonspeculative(uuid, '{title}'))
+    .then(compare_with_nonspeculative(uuid, '{title}', {test_nonspeculative}))
     .then(done);
 </script>
 """
@@ -106,7 +111,7 @@
   setup({{single_test: true}});
   const uuid = token();
   expect_fetched_onload(uuid, {expect_load})
-    .then(compare_with_nonspeculative(uuid, '{title}'))
+    .then(compare_with_nonspeculative(uuid, '{title}', {test_nonspeculative}))
     .then(done);
   document.write(`
     <script src=/common/slow.py><\\/script>
@@ -145,18 +150,19 @@ def write_file(path, content):
     file.close()
 
 for testcase in tests:
-    title, template_testcase_markup, expect_load = testcase
+    title, template_testcase_markup, expect_load, test_nonspeculative = testcase
 
     html_testcase_markup = template_testcase_markup.format(url_wptserve_sub)
     js_testcase_markup = template_testcase_markup.format(url_js_sub).replace(u"</script>", u"<\/script>")
 
-    nonspeculative = template_nonspeculative.format(preamble=preamble, title=title, testcase_markup=html_testcase_markup)
-    write_file(f"resources/{title}-nonspeculative.sub.html", nonspeculative)
+    if test_nonspeculative is u'true':
+        nonspeculative = template_nonspeculative.format(preamble=preamble, title=title, testcase_markup=html_testcase_markup)
+        write_file(f"resources/{title}-nonspeculative.sub.html", nonspeculative)
 
-    pageload_toplevel = template_pageload_toplevel.format(preamble=preamble, title=title, expect_load=expect_load)
+    pageload_toplevel = template_pageload_toplevel.format(preamble=preamble, title=title, expect_load=expect_load, test_nonspeculative=test_nonspeculative)
     write_file(f"page-load/{title}.html", pageload_toplevel)
     pageload_framed = template_pageload_framed.format(preamble=preamble, title=title, testcase_markup=html_testcase_markup)
     write_file(f"page-load/resources/{title}-framed.sub.html", pageload_framed)
 
-    docwrite = template_docwrite.format(preamble=preamble, title=title, expect_load=expect_load, testcase_markup=js_testcase_markup)
+    docwrite = template_docwrite.format(preamble=preamble, title=title, expect_load=expect_load, testcase_markup=js_testcase_markup, test_nonspeculative=test_nonspeculative)
     write_file(f"document-write/{title}.html", docwrite)