From c1194b6167e09d997817116fb1af31eb6afde6e7 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Fri, 4 Oct 2019 23:11:14 +0000
Subject: [PATCH] Bug 1578878 [wpt PR 18849] - [WPT/referrer-policy] Regenerate
 img-tag meta-referrer tests, a=testonly

Automatic update from web-platform-tests
[WPT/referrer-policy] Regenerate img-tag meta-referrer tests

This CL regenerates img-tag meta-referrer test files
that reflects changes [1] and previous changes in
https://crbug.com/906850 and removes old files.

Purely mechanical.
This CL largely renames test file names, and [2] contains
old->new file name mapping data.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1586548
[2] https://chromium-review.googlesource.com/c/chromium/src/+/1783799

Bug: 906850
Change-Id: I311878a58c46ec82c26b9a6f33a99f49b867b9a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1785090
Reviewed-by: Kenichi Ishibashi <bashichromium.org>
Reviewed-by: Hiroki Nakagawa <nhirokichromium.org>
Commit-Queue: Hiroshige Hayashizaki <hiroshigechromium.org>
Cr-Commit-Position: refs/heads/master{#693543}

--

wpt-commits: f2fc63e1ddb9a4b81a085e3b9d5cfb9fc7d17980
wpt-pr: 18849

UltraBlame original commit: 0a76db92f6c68502591201d2ed4b91256ec27ad3
---
 .../img-tag/cross-http.keep-origin.http.html  | 456 +++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 456 +++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 456 +++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 456 +++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 456 +++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 456 +++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 456 +++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 456 +++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 456 +++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 456 +++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 456 +++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 456 +++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html} | 139 +++--
 .../img-tag/cross-http.swap-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 429 ++++++++++++++++
 .../cross-https.no-redirect.http.html}        | 141 +++---
 .../img-tag/cross-https.swap-origin.http.html | 429 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 429 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html}  | 139 +++--
 .../img-tag/same-http.swap-origin.http.html   | 429 ++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html} | 141 +++---
 .../img-tag/same-https.swap-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 454 +++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 454 +++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 454 +++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html}  | 161 +++---
 .../img-tag/same-http.no-redirect.http.html}  | 165 +++---
 .../img-tag/same-http.swap-origin.http.html   | 454 +++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html} | 159 +++---
 .../img-tag/same-https.swap-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 429 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 429 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 429 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 429 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 429 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 429 ++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 429 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 438 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 438 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 438 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 438 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 438 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 438 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 442 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 442 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 438 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 438 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 470 +++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 470 +++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 470 +++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 470 +++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 470 +++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 470 +++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 474 ++++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 474 ++++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 470 +++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 470 +++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 470 +++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 470 +++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 444 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 444 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 444 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 444 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 444 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 444 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 444 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 444 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 444 ++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 444 ++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 444 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 444 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 434 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 434 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 434 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 434 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 434 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 434 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 434 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 434 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 434 ++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 434 ++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 434 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 434 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html} | 115 ++---
 .../img-tag/cross-http.no-redirect.http.html} | 113 ++---
 .../img-tag/cross-http.swap-origin.http.html} | 115 ++---
 .../cross-https.keep-origin.http.html}        | 117 ++---
 .../cross-https.no-redirect.http.html}        | 115 ++---
 .../cross-https.swap-origin.http.html}        | 117 ++---
 .../img-tag/same-http.keep-origin.http.html}  | 115 ++---
 .../img-tag/same-http.no-redirect.http.html}  | 113 ++---
 .../img-tag/same-http.swap-origin.http.html}  | 115 ++---
 .../img-tag/same-https.keep-origin.http.html} | 117 ++---
 .../img-tag/same-https.no-redirect.http.html} | 115 ++---
 .../img-tag/same-https.swap-origin.http.html} | 117 ++---
 .../img-tag/cross-http.keep-origin.http.html} | 176 +++----
 .../img-tag/cross-http.no-redirect.http.html} | 174 ++++---
 .../img-tag/cross-http.swap-origin.http.html} | 176 +++----
 .../cross-https.keep-origin.http.html}        | 178 +++----
 .../cross-https.no-redirect.http.html}        | 176 ++++---
 .../cross-https.swap-origin.http.html}        | 178 +++----
 .../img-tag/same-http.keep-origin.http.html}  | 176 +++----
 .../img-tag/same-http.no-redirect.http.html}  | 174 ++++---
 .../img-tag/same-http.swap-origin.http.html}  | 176 +++----
 .../img-tag/same-https.keep-origin.http.html} | 178 +++----
 .../img-tag/same-https.no-redirect.http.html} | 176 ++++---
 .../img-tag/same-https.swap-origin.http.html} | 178 +++----
 .../img-tag/cross-http.keep-origin.http.html} | 164 +++---
 .../img-tag/cross-http.no-redirect.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html} | 164 +++---
 .../cross-https.keep-origin.http.html}        | 166 +++---
 .../img-tag/cross-https.no-redirect.http.html | 454 +++++++++++++++++
 .../cross-https.swap-origin.http.html}        | 166 +++---
 .../img-tag/same-http.keep-origin.http.html}  | 164 +++---
 .../img-tag/same-http.no-redirect.http.html   | 454 +++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html}  | 164 +++---
 .../img-tag/same-https.keep-origin.http.html} | 166 +++---
 .../img-tag/same-https.no-redirect.http.html  | 454 +++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html} | 166 +++---
 .../img-tag/cross-http.keep-origin.http.html} | 170 ++++---
 .../img-tag/cross-http.no-redirect.http.html} | 168 ++++---
 .../img-tag/cross-http.swap-origin.http.html} | 170 ++++---
 .../cross-https.keep-origin.http.html}        | 172 ++++---
 .../cross-https.no-redirect.http.html}        | 170 ++++---
 .../cross-https.swap-origin.http.html}        | 172 ++++---
 .../img-tag/same-http.keep-origin.http.html}  | 176 +++----
 .../img-tag/same-http.no-redirect.http.html}  | 174 ++++---
 .../img-tag/same-http.swap-origin.http.html}  | 172 ++++---
 .../img-tag/same-https.keep-origin.http.html} | 174 ++++---
 .../img-tag/same-https.no-redirect.http.html} | 172 ++++---
 .../img-tag/same-https.swap-origin.http.html} | 174 ++++---
 .../img-tag/cross-http.keep-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 454 +++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 454 +++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 454 +++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html}  | 156 +++---
 .../img-tag/same-http.no-redirect.http.html   | 454 +++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 454 +++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 454 +++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 454 +++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 463 +++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html} | 160 +++---
 .../img-tag/cross-http.swap-origin.http.html  | 463 +++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 463 +++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 463 +++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 463 +++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 467 +++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html}  | 160 +++---
 .../img-tag/same-http.swap-origin.http.html}  | 160 +++---
 .../img-tag/same-https.swap-origin.http.html} | 162 +++---
 .../img-tag/cross-http.keep-origin.http.html} | 176 +++----
 .../img-tag/cross-http.no-redirect.http.html} | 174 ++++---
 .../img-tag/cross-http.swap-origin.http.html} | 176 +++----
 .../cross-https.keep-origin.http.html}        | 178 +++----
 .../cross-https.no-redirect.http.html}        | 176 ++++---
 .../cross-https.swap-origin.http.html}        | 178 +++----
 .../img-tag/same-http.keep-origin.http.html}  | 182 +++----
 .../img-tag/same-http.no-redirect.http.html}  | 180 +++----
 .../img-tag/same-http.swap-origin.http.html}  | 178 +++----
 .../img-tag/same-https.keep-origin.http.html} | 180 +++----
 .../img-tag/same-https.no-redirect.http.html} | 178 +++----
 .../img-tag/same-https.swap-origin.http.html} | 180 +++----
 .../img-tag/cross-http.keep-origin.http.html} | 160 +++---
 .../img-tag/cross-http.no-redirect.http.html} | 158 +++---
 .../img-tag/cross-http.swap-origin.http.html} | 160 +++---
 .../cross-https.keep-origin.http.html}        | 162 +++---
 .../cross-https.no-redirect.http.html}        | 160 +++---
 .../cross-https.swap-origin.http.html}        | 162 +++---
 .../img-tag/same-http.keep-origin.http.html}  | 160 +++---
 .../img-tag/same-http.no-redirect.http.html}  | 158 +++---
 .../img-tag/same-http.swap-origin.http.html}  | 160 +++---
 .../img-tag/same-https.keep-origin.http.html} | 162 +++---
 .../img-tag/same-https.no-redirect.http.html} | 160 +++---
 .../img-tag/same-https.swap-origin.http.html} | 162 +++---
 .../img-tag/cross-http.keep-origin.http.html} | 166 +++---
 .../img-tag/cross-http.no-redirect.http.html} | 164 +++---
 .../img-tag/cross-http.swap-origin.http.html} | 166 +++---
 .../cross-https.keep-origin.http.html}        | 168 ++++---
 .../cross-https.no-redirect.http.html}        | 166 +++---
 .../cross-https.swap-origin.http.html}        | 168 ++++---
 .../img-tag/same-http.keep-origin.http.html}  | 166 +++---
 .../img-tag/same-http.no-redirect.http.html}  | 164 +++---
 .../img-tag/same-http.swap-origin.http.html}  | 166 +++---
 .../img-tag/same-https.keep-origin.http.html} | 168 ++++---
 .../img-tag/same-https.no-redirect.http.html} | 166 +++---
 .../img-tag/same-https.swap-origin.http.html} | 168 ++++---
 .../img-tag/cross-http.keep-origin.http.html  | 441 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 441 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 441 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 441 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 441 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 441 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 441 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 441 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 441 ++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 441 ++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 441 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 441 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 414 +++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 414 +++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 414 +++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 414 +++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 414 +++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 414 +++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 414 +++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 414 +++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 414 +++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 414 +++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 414 +++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 414 +++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 439 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html} | 161 +++---
 .../img-tag/cross-http.swap-origin.http.html} | 161 +++---
 .../cross-https.keep-origin.http.html}        | 161 +++---
 .../cross-https.no-redirect.http.html}        | 159 +++---
 .../cross-https.swap-origin.http.html}        | 161 +++---
 .../img-tag/same-http.keep-origin.http.html}  | 167 +++---
 .../img-tag/same-http.no-redirect.http.html}  | 165 +++---
 .../img-tag/same-http.swap-origin.http.html}  | 163 +++---
 .../img-tag/same-https.keep-origin.http.html} | 163 +++---
 .../img-tag/same-https.no-redirect.http.html} | 161 +++---
 .../img-tag/same-https.swap-origin.http.html} | 163 +++---
 .../img-tag/cross-http.keep-origin.http.html  | 414 +++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 414 +++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 414 +++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 414 +++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 414 +++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 414 +++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 414 +++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 414 +++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 414 +++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 414 +++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 414 +++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 414 +++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 423 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 423 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 423 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 423 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 423 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 423 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 427 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 427 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 423 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 423 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 455 +++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 455 +++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 455 +++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 455 +++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 455 +++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 455 +++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 459 +++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html}  | 180 +++----
 .../img-tag/same-http.swap-origin.http.html   | 455 +++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html} | 174 +++----
 .../img-tag/same-https.no-redirect.http.html} | 176 +++----
 .../img-tag/same-https.swap-origin.http.html  | 455 +++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 429 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 429 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 429 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 429 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 429 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 429 ++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 429 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 429 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 419 ++++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 419 ++++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 419 ++++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 419 ++++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 419 ++++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 419 ++++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 419 ++++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 419 ++++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 419 ++++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 419 ++++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 419 ++++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 419 ++++++++++++++++
 .../img-tag/cross-http.keep-origin.http.html  | 405 +++++++++++++++
 .../img-tag/cross-http.no-redirect.http.html  | 405 +++++++++++++++
 .../img-tag/cross-http.swap-origin.http.html  | 405 +++++++++++++++
 .../img-tag/cross-https.keep-origin.http.html | 405 +++++++++++++++
 .../img-tag/cross-https.no-redirect.http.html | 405 +++++++++++++++
 .../img-tag/cross-https.swap-origin.http.html | 405 +++++++++++++++
 .../img-tag/same-http.keep-origin.http.html   | 405 +++++++++++++++
 .../img-tag/same-http.no-redirect.http.html   | 405 +++++++++++++++
 .../img-tag/same-http.swap-origin.http.html   | 405 +++++++++++++++
 .../img-tag/same-https.keep-origin.http.html  | 405 +++++++++++++++
 .../img-tag/same-https.no-redirect.http.html  | 405 +++++++++++++++
 .../img-tag/same-https.swap-origin.http.html  | 405 +++++++++++++++
 306 files changed, 96249 insertions(+), 8191 deletions(-)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html => gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html => gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html => gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html => gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html => gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html => gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html} (83%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html => gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html} (82%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html} (80%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html} (80%)
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
 rename testing/web-platform/tests/referrer-policy/{no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html => gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html => gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html} (82%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html => gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html => gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html => gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html => gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html => gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html} (83%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html} (81%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html => gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html} (81%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html => gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html} (83%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html => gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html} (82%)
 rename testing/web-platform/tests/referrer-policy/{same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html => gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html} (82%)
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html
 create mode 100644 testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html

diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..0dba0b94bb2a4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..1a96546a5229b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..55a7620f7a47b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..b984d7d4096e5
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..f83b34774cbef
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..753df5a98d6b7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..9eb08a9599635
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..22b8adc1180af
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..25ae9d33daa41
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..6aa6da1da4af3
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..ca1030f236be9
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..f220c451c4b05
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,456 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..38717fc72166a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
index c2f24091ad753..1ece2dd56c26f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,51 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -290,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -348,23 +335,28 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -380,12 +372,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..782a2d6592281
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..8ba8dd65223ff
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
index ab47740c21784..855b4bebec460 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,51 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -290,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -348,27 +335,32 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -380,12 +372,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..87bf2454d3d9c
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..f7c966b0a0c72
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
index 59e8249a2fdaf..d210cfebe1141 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,51 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -290,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -348,23 +335,28 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -380,12 +372,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..3b2709f025694
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..aca052744afda
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
index 3e73569d04b4d..5e350cf8ab0a0 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,51 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -290,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -348,27 +335,32 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -380,12 +372,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..48ffb6fdde56e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..361d58db3a022
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..23aa2f19c031a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..baeb2975eb6e2
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..ab5fd7986a639
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..21f1db1f55d7a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..723635f71883d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 41b1fd1752062..88bbc026ae0cb 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -63,7 +65,11 @@
 set
 to
 '
-same
+origin
+-
+when
+-
+cross
 -
 origin
 '
@@ -73,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -88,9 +104,13 @@
 origin
 subresources
 get
-no
+the
+origin
+portion
+of
+the
 referrer
-information
+URL
 and
 same
 -
@@ -104,21 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -171,7 +176,11 @@
 -
 policy
 -
-same
+origin
+-
+when
+-
+cross
 -
 origin
 "
@@ -186,50 +195,50 @@
 content
 =
 "
-The
-referrer
-URL
-is
-omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
+Referrer
+Policy
+:
+Expects
+stripped
 -
-resource
-via
+referrer
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 keep
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -301,10 +310,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -328,26 +333,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -357,27 +362,30 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -393,12 +401,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index e96453998734c..e02c9e90c037a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -63,7 +65,11 @@
 set
 to
 '
-same
+origin
+-
+when
+-
+cross
 -
 origin
 '
@@ -73,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -88,9 +104,13 @@
 origin
 subresources
 get
-no
+the
+origin
+portion
+of
+the
 referrer
-information
+URL
 and
 same
 -
@@ -104,21 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -171,7 +176,11 @@
 -
 policy
 -
-same
+origin
+-
+when
+-
+cross
 -
 origin
 "
@@ -186,50 +195,50 @@
 content
 =
 "
-The
-referrer
-URL
-is
-omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
+Referrer
+Policy
+:
+Expects
+stripped
 -
-resource
-via
+referrer
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
+and
+no
 -
 redirect
-and
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -301,10 +310,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -328,56 +333,59 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
 "
 :
 "
-swap
--
-origin
+no
 -
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -393,12 +401,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..1e397c207edc7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..bfbffdb2d6e87
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 675e8b82c7642..31f72ed610d94 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -63,7 +65,11 @@
 set
 to
 '
-same
+origin
+-
+when
+-
+cross
 -
 origin
 '
@@ -73,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -88,9 +104,13 @@
 origin
 subresources
 get
-no
+the
+origin
+portion
+of
+the
 referrer
-information
+URL
 and
 same
 -
@@ -104,21 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -171,7 +176,11 @@
 -
 policy
 -
-same
+origin
+-
+when
+-
+cross
 -
 origin
 "
@@ -186,48 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
-omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+Referrer
+Policy
+:
+Expects
+origin
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -299,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -326,26 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -357,27 +360,32 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -389,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..f02ae504949d0
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..7013d553e7d8f
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..eb3d834bfee34
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..3a909a224aa43
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..0cc6be794235e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..b40a5735d017a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..931243176358d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..71a61533a03a7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..b21b28d7103c1
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..099b91d3e1646
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..74c25e637fd67
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..b7996d2ea8b96
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..1628fc94b9efc
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..89ac3e56c875a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..6b097b0b0e872
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..72b45cc807217
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..e6c2481437c82
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..a52e7cc0fbbe6
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..5597ad8fee7c4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..5e6a21b8d53c3
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,442 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..d2c4ef394af22
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,442 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..26a492c9a0569
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..ec91a3c6a3ef2
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,438 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..456e81505f1ee
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..910486b2b34db
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..5e74361fdfee2
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..fda0509f778bf
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..53016bb463c68
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..c6721ae3d2cb5
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..3af3f4892366b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,474 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..0843c667f2105
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,474 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..4389a2eae2bd5
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..387ac7ebdafc2
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..4112f7de9bff7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..d23aff17e76f4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,470 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..bc1ecc3478992
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..e0cfb3d7f5b01
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..e17c31eee863b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..62c694a35cffc
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..f1661867fa777
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..f721961db61b0
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..c4ee8a53f64a7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..46f6a2ae72c99
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..47be5a5040b6e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..97b41e8bbb69a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..02a3c461940e9
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..d0f8f7ac45e8e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,444 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..70057d5c48700
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..845fd35024275
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..8bcdbcb63bdcc
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..8db3ffc391f50
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..492dafa1a6fc0
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..45c7281e0d1a1
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..747bb4d52eace
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..41cd74321ce58
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..cda59e1852d11
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..087a1964721ff
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..f0d5e82b5db59
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..59103cec9423d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,434 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html
index 775b5b2f55ddb..7ce21d1df9aad 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -333,27 +324,30 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
index 7defa7c364222..8df9bd4dd3b94 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,49 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -279,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -306,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -333,23 +326,28 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -365,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html
index bce8aed015e6e..75fc256ba639d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -333,27 +324,30 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html
index 05337f470f14e..4dfa40ed8b32b 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -333,31 +324,34 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
index 69d4dc635c05f..64f11e0d8da41 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,49 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -279,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -306,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -333,27 +326,32 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -365,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html
index 7d0202a082412..47f930e716983 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -333,31 +324,34 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html
index 6df7f27af47e9..65c6c9cfc4360 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -333,27 +324,30 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
index 6a3e0a19a4c52..2b9065a004ca1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,49 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -279,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -306,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -333,23 +326,28 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -365,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html
index aacf3b0d5d7e7..face8aa025370 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -333,27 +324,30 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html
index 28f6e5995db88..8552f38f62cbb 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -333,31 +324,34 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
index 3a6d452974765..c3687796c845c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,49 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -279,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -306,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -333,27 +326,32 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -365,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html
index 86d073ba5472d..824a0e0e898cd 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -69,6 +71,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -164,51 +176,30 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
@@ -281,10 +272,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -308,22 +295,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
-null
 "
-delivery_method
+stripped
+-
+referrer
+"
+"
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -333,31 +324,34 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
--
-origin
+policyDeliveries
 "
+:
+[
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -369,14 +363,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index 23fd438c9c521..aa2e4dc797212 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -377,27 +356,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 720f4ac128cd1..6d5aab7c8753f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,53 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -315,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -342,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -377,23 +358,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -409,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
index 736588a3cf032..443facb6a9175 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -377,27 +356,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
index f07d14b4d46ef..008efe94f7f27 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +356,63 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index 2199f32c0f01a..8679fbd8e3556 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,53 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -315,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -342,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -377,27 +358,61 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -409,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
index 0f06708c59736..69352987c590d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +356,63 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index 74e7a7fa2ecb0..559ebf7328fe7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -377,27 +356,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index 681a86406e95c..c385f3991f1f0 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,53 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -315,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -342,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -377,23 +358,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -409,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index c7ea9babb65e5..13a0d57431c05 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -377,27 +356,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
index 8281cfbd3349c..9c8ff8c020d87 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +356,63 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index bd548acfd3a59..4fcb8acf1823f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,53 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -315,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -342,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -377,27 +358,61 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -409,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
index 63aee1048eccb..a9420a70c1215 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,25 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
--
-when
--
-downgrade
-"
->
-<
 link
 rel
 =
@@ -200,55 +193,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
+stripped
 -
 referrer
--
-when
--
-downgrade
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +356,63 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
+-
+when
+-
+downgrade
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,14 +424,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
index d94f753049d2b..e42c55b4152fc 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -348,27 +333,55 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..6e35e67c4b6b4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
+-
+referrer
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
index 93f3f425e720b..0d48858382433 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -348,27 +333,55 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
index 59f7094c9aa9f..3df7d0a23b34e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -348,31 +333,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..065f4cd26efc6
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
+-
+referrer
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
index 2f78fb05672c8..33723028fb475 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -348,31 +333,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
similarity index 80%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
index ba5c1ea8a46ac..539a2067bf0ca 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -348,27 +333,55 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..62debc17d0ae4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
+-
+referrer
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
similarity index 80%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
index 45464b1d15663..fe7f34c5d46ca 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -348,27 +333,55 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
index fff025546a0b5..43a972713ed97 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -348,31 +333,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..2c944148cee1b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
+-
+referrer
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
index 593186145d917..cd5f138e1c91e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -95,21 +107,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-no
--
-referrer
-"
->
-<
 link
 rel
 =
@@ -177,53 +174,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
 script
 src
 =
@@ -292,10 +283,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,26 +306,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-no
--
-referrer
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -348,31 +333,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+no
 -
-origin
+referrer
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -384,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 043f510de660f..f63aaca7613aa 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -377,27 +354,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -413,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index fe32ca6cacb3a..db5f28c0fe760 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,51 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -315,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -342,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -377,23 +356,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
+"
+policyDeliveries
 "
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -409,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 1b2a29248f060..4119ed2cfe059 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -377,27 +354,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -413,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 64cd9bf16ceed..f5392e327749d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +354,63 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
+"
+policyDeliveries
 "
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index fe9fb4204cb4a..d8eea518fef8f 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,51 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -315,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -342,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -377,27 +356,61 @@
 redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -409,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 1778502710f1b..1822b2e599d3c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +354,63 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
+"
+policyDeliveries
 "
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 9ae91180bee03..6b42907abaadf 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,55 +195,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -319,10 +306,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -346,30 +329,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-origin
--
-when
--
-cross
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -379,27 +358,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -415,14 +426,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 2b9cc67413b28..6abb77122d945 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +306,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +329,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-origin
--
-when
--
-cross
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -379,23 +360,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -411,14 +426,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 3d64b67e4aebd..c62622ef19232 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -377,27 +354,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -413,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 979ecb36ab240..677b1faa6c8cd 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +354,63 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 8902ceb781467..cc5b37a55c3d6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,51 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -315,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -342,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -377,27 +356,61 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -409,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 789c8d6f312e8..37d7744681624 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -77,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -112,25 +124,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -202,53 +195,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -317,10 +304,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -344,30 +327,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
--
-when
--
-cross
--
-origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -377,31 +354,63 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -413,12 +422,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..a9916c5d766a5
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..69189ebc5be3e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..6bfaf1c961823
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..40029b06a7431
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..51a83ce484b9d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..133e489fd82ae
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
index 4cd22b63b9fbf..a570fc823a363 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -71,6 +73,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -99,19 +111,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-origin
-"
->
-<
 link
 rel
 =
@@ -177,53 +176,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -292,10 +285,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,24 +308,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -346,27 +335,53 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
-same
--
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -382,12 +397,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..043ba865e53c1
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..90d808ecdfd34
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..69e48f8dbb310
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..fd255eea7759e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..108a219cd124e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,454 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..b12b2f0d23d10
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,463 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+same
+-
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
index c575c94dfbf34..d22d6f16b1e9c 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -104,21 +116,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -186,51 +183,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -299,10 +292,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -326,26 +315,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
--
-origin
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -357,23 +344,53 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+same
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -389,12 +406,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..a47ba3f28b3ed
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,463 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+same
+-
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..a6d18837cc628
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,463 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+same
+-
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..61aca4b23c24a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,463 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+same
+-
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..b6553b0b45671
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,463 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+same
+-
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..02cfa9b36f2d2
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,467 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+same
+-
+origin
+"
+}
+]
+"
+sourceContextType
+"
+:
+"
+srcdoc
+"
+}
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
index cc8fbf58a2748..da7e6f6f1de8e 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -104,21 +116,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -186,53 +183,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -301,10 +294,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -328,26 +317,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -359,7 +348,33 @@
 redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
@@ -367,15 +382,19 @@
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -391,14 +410,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
index e602d4b332af9..4072543778fac 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -104,21 +116,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -186,53 +183,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -301,10 +292,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -328,26 +315,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
--
-origin
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -357,11 +342,35 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
@@ -369,15 +378,19 @@
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -393,12 +406,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
index 1af9ebb6b730f..a64dd70d80b78 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -104,21 +116,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -186,53 +183,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -301,10 +292,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -328,26 +315,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
--
-origin
+omitted
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -357,11 +342,35 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
@@ -369,19 +378,23 @@
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -393,12 +406,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 321bc3f92fcc8..edcfff92db70e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -395,27 +368,61 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
+strict
+-
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -431,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index eda4f4c6a6404..207d0d18ff640 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,51 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -331,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -358,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -395,23 +370,59 @@
 redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
+strict
+-
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -427,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 141307d5f6af1..cfdd7965e6ccb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -395,27 +368,61 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
+"
+:
+[
+{
+"
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
 "
 :
 "
+strict
+-
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -431,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 0cb0468778709..d01e545279e8e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -395,31 +368,65 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
+"
+policyDeliveries
 "
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -431,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 889f6e4bb0b6d..95b0968f9911b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,51 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -331,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -358,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -395,27 +370,63 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
+"
+policyDeliveries
 "
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -427,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 02fa817a4703a..3e9c1d4a25ec5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -395,31 +368,65 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
+"
+policyDeliveries
 "
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
 cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -431,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 0091b17bc7ace..c826ec04073d1 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,55 +209,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -335,10 +320,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -362,32 +343,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -397,27 +372,61 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -433,14 +442,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 589f9e22937ac..c038d21d517cd 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +320,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +343,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -397,23 +374,59 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -429,14 +442,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index ca511f1f80a12..6ab8733e28051 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -395,27 +368,61 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -431,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index b95b8d7327af3..e93fadfccec63 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -395,31 +368,65 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -431,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index c0c16791cdf6f..a24f83e307f61 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,51 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -331,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -358,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -395,27 +370,63 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -427,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 73786707bbe58..03c4c9da380aa 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -79,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -124,27 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
--
-when
--
-cross
--
-origin
-"
->
-<
 link
 rel
 =
@@ -218,53 +209,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -333,10 +318,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -360,32 +341,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
-origin
--
-when
--
-cross
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -395,31 +368,65 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -431,12 +438,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
index 540f4e080bd98..9883ee1dc3fa0 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -363,27 +348,55 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
index a7d20dd697502..2abde87dfa5b9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,51 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -305,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -332,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -363,23 +350,53 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -395,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
index 9a165dd81be2f..489b406f3634f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -363,27 +348,55 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
index 12ebbed1a7da4..a69078113de67 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -363,31 +348,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
index fbb629603ce67..2430a5283b188 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,51 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -305,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -332,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -363,27 +350,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -395,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
index 1ffd120c92d44..f803c012589a8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -363,31 +348,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
index 1dcb227cbeace..247163954689a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -363,27 +348,55 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
index b4f9f082478e3..f2f578acc9d59 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,51 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -305,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -332,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -363,23 +350,53 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -395,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
index 44e8f82bd24a5..37481f786eb77 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -363,27 +348,55 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
index 534ca852e1993..041ede4297d0f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -363,31 +348,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
index 13cc95d8cb615..5fd8ccf1a5777 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,51 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -305,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -332,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -363,27 +350,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -395,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
index b2a53a9dc2b58..872eda2ba7929 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -110,21 +122,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-strict
--
-origin
-"
->
-<
 link
 rel
 =
@@ -192,53 +189,47 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -307,10 +298,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -334,26 +321,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-strict
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -363,31 +348,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+strict
 -
 origin
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -399,12 +412,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
index d9ba42dea05f5..e694ec0cef89c 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -351,27 +338,55 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
index ba2f3e679069a..b68897cb8e249 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,53 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -293,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -320,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -351,23 +340,53 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -383,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
index 4a9ede2cf8c1a..2adcadd2e2db4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -351,27 +338,55 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
index 21f9322972ae5..8b12db3da774a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -351,31 +338,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
index f4a0566fd8183..c40836932948d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,53 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-cross
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -293,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -320,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -351,27 +340,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -383,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
index cc32c7158e931..54ce954398208 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+cross
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-cross
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -351,31 +338,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-cross
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
index cc744fadb0f8d..a5fb346ecd1d5 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -351,27 +338,55 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
index 76cf60a937d8a..1e4ac936684c7 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,53 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -293,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -320,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -351,23 +340,53 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -383,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
index b5954337e1891..b96f556f7f99c 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+http
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -351,27 +338,55 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
index c3180e3e1ee35..bb07d2898cc3d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-keep
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+keep
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -351,31 +338,59 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
index 68bf8aaca64a4..46bfb7d205072 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,53 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
-when
-the
-target
-request
-is
-same
--
-origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -293,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -320,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -351,27 +340,57 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -383,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
index 6a2d4a1307037..f32869294523e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -73,6 +75,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -96,21 +108,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-unsafe
--
-url
-"
->
-<
 link
 rel
 =
@@ -178,55 +175,49 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
--
-referrer
-delivery
-method
-with
-swap
+to
+same
 -
+https
 origin
--
-redirect
 and
-when
-the
-target
-request
-is
-same
+swap
 -
 origin
+redirection
+from
+http
+context
 .
 "
 >
 <
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
 script
 src
 =
@@ -295,10 +286,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -322,26 +309,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-unsafe
+stripped
 -
-url
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -351,31 +338,59 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+{
 "
-same
+policyDeliveries
+"
+:
+[
+{
+"
+deliveryType
+"
+:
+"
+meta
+"
+"
+key
+"
+:
+"
+referrerPolicy
+"
+"
+value
+"
+:
+"
+unsafe
 -
-origin
+url
 "
+}
+]
 "
-source_protocol
+sourceContextType
 "
 :
 "
-http
+srcdoc
 "
+}
+]
 "
-target_protocol
+source_scheme
 "
 :
 "
-https
+http
 "
 "
 subresource
@@ -387,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..1826d2c100ff0
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..e5d4127eb5152
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..c64204c6fbaa3
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..46fa812728964
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..a117ae7628d2a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..ba3c97772dfc9
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..6278eb5c4692e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..24d08b082fd08
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..1d580f0e4655a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..ca4594d393fa8
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..5d440a57d6bcf
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..0c0ccc1f210d8
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,441 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+-
+when
+-
+downgrade
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+the
+full
+Referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+-
+when
+-
+downgrade
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..bb678e44001bb
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..8ade51807a9af
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..ef00d95455857
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..06a26475430bb
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..4755ed6eaef2b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..7ad9c5fb04608
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..be264b903ea17
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..4b98a286693bf
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..093e7edf95c4e
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..e38cb1cbf65f9
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..f32274e46e783
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..588cf2cf93b58
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+no
+-
+referrer
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+sub
+-
+resource
+never
+gets
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+no
+-
+referrer
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+no
+-
+referrer
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..a7b3e0a3ecc30
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,439 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index bebae60f77038..3272663203154 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,48 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
 when
-the
-target
-request
-is
-same
+-
+cross
 -
 origin
-.
 "
 >
 <
@@ -290,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -346,23 +360,13 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-same
--
-origin
-"
-"
-source_protocol
-"
-:
-"
-http
-"
-"
-target_protocol
+source_scheme
 "
 :
 "
@@ -378,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 88ab263cc6dec..468dd09b19c4b 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,50 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 swap
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -292,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+http
 "
 "
 redirection
@@ -346,27 +358,15 @@
 swap
 -
 origin
--
-redirect
-"
-"
-origin
-"
-:
-"
-cross
--
-origin
 "
 "
-source_protocol
+source_context_list
 "
 :
+[
+]
 "
-http
-"
-"
-target_protocol
+source_scheme
 "
 :
 "
@@ -382,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 7f84f892a2a8d..377d694c48304 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,50 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 keep
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -292,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -346,33 +358,21 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-cross
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -382,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 54052494be134..21c752bd32a97 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,48 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -290,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -346,29 +360,19 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-cross
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -378,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index cee90fdd4c227..721b84af2030b 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,50 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+cross
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 swap
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -292,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+cross
 -
-referrer
+https
 "
 "
 redirection
@@ -346,33 +358,21 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-cross
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -382,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 964e769fc2739..8c1e8ec67188b 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,50 +195,50 @@
 content
 =
 "
-The
-referrer
-URL
-is
-origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
+Referrer
+Policy
+:
+Expects
+stripped
 -
-resource
-via
+referrer
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 keep
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -292,10 +310,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,54 +333,44 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-origin
-"
-"
-delivery_method
-"
-:
-"
-meta
+stripped
 -
 referrer
 "
 "
-redirection
+origin
 "
 :
 "
-keep
--
-origin
+same
 -
-redirect
+http
 "
 "
-origin
+redirection
 "
 :
 "
-cross
+keep
 -
 origin
 "
 "
-source_protocol
+source_context_list
 "
 :
+[
+]
 "
-http
-"
-"
-target_protocol
+source_scheme
 "
 :
 "
@@ -382,12 +386,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index f93739aff4e7e..7703440b3cc62 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,48 +195,50 @@
 content
 =
 "
-The
-referrer
-URL
-is
-origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
+Referrer
+Policy
+:
+Expects
+stripped
 -
-resource
-via
+referrer
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 no
 -
 redirect
-and
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -290,10 +310,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,24 +333,26 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-origin
+stripped
+-
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -346,23 +364,13 @@
 redirect
 "
 "
-origin
-"
-:
-"
-cross
--
-origin
-"
-"
-source_protocol
+source_context_list
 "
 :
+[
+]
 "
-http
-"
-"
-target_protocol
+source_scheme
 "
 :
 "
@@ -378,12 +386,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 1a1397708f6e7..d2a3410c0b32a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,50 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+http
+origin
+and
 swap
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
-same
+-
+cross
 -
 origin
-.
 "
 >
 <
@@ -292,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
@@ -346,27 +358,15 @@
 swap
 -
 origin
--
-redirect
-"
-"
-origin
-"
-:
-"
-same
--
-origin
 "
 "
-source_protocol
+source_context_list
 "
 :
+[
+]
 "
-http
-"
-"
-target_protocol
+source_scheme
 "
 :
 "
@@ -382,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index b5c8008d4b494..a9c46878b41ca 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,50 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 keep
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
-same
+-
+cross
 -
 origin
-.
 "
 >
 <
@@ -292,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -346,33 +358,21 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-same
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -382,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 123e175e2f902..17b7a58fa371b 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,48 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 no
 -
 redirect
-and
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+-
 when
-the
-target
-request
-is
-same
+-
+cross
 -
 origin
-.
 "
 >
 <
@@ -290,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -317,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -346,29 +360,19 @@
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-same
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -378,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
similarity index 81%
rename from testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 5fa62a077aa83..be68bf37a5e25 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -64,6 +66,12 @@
 to
 '
 origin
+-
+when
+-
+cross
+-
+origin
 '
 <
 /
@@ -71,6 +79,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -81,13 +99,11 @@
 "
 Check
 that
-all
+cross
+-
+origin
 subresources
-in
-all
-casses
 get
-only
 the
 origin
 portion
@@ -95,20 +111,16 @@
 the
 referrer
 URL
-.
-"
->
-<
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
+and
+same
+-
 origin
+get
+the
+stripped
+referrer
+URL
+.
 "
 >
 <
@@ -165,6 +177,12 @@
 policy
 -
 origin
+-
+when
+-
+cross
+-
+origin
 "
 >
 <
@@ -177,50 +195,48 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 origin
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 swap
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
-same
+-
+cross
 -
 origin
-.
 "
 >
 <
@@ -292,10 +308,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -319,24 +331,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -346,33 +358,21 @@
 swap
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-same
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -382,12 +382,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-origin
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..240dc745f44fe
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..b4a01a177dcfe
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..4596ddba49fbb
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..6d321a20b3bbe
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..ac059e337dcf0
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..68125c5fef782
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..cea6573762080
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..2b8537a7395bf
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..20fc4afa19e05
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..d3544ab4095bb
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..c287ac3d3fd10
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..23da2006e57bc
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,414 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+subresources
+in
+all
+casses
+get
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..fa810508da0f7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..d1752bc798c3d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..d75e595d5020d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..82989ecb6d5d3
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..c96b3b6843d3d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..018af40798904
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..efa950d452072
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,427 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..a7fdec1552311
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,427 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..cae2434fc9f25
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..16138ff72fe3d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,423 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+same
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+cross
+-
+origin
+subresources
+get
+no
+referrer
+information
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+same
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+omitted
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+same
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+omitted
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..a0777911f648c
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..a55acdd18b603
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..2edacaedea8c9
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..9ce1c0e76d3db
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..db48f41211a09
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..bd734b68a8a95
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..f67d9f384b8ec
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,459 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 83%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index c09fcb175d189..1179e123bb47b 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -63,7 +65,13 @@
 set
 to
 '
-same
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 '
@@ -73,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -83,14 +101,28 @@
 "
 Check
 that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
 cross
 -
 origin
 subresources
 get
-no
+the
+origin
+portion
+of
+the
 referrer
-information
+URL
 and
 same
 -
@@ -104,21 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -171,7 +188,13 @@
 -
 policy
 -
-same
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
@@ -186,52 +209,52 @@
 content
 =
 "
-The
-referrer
-URL
-is
+Referrer
+Policy
+:
+Expects
 stripped
 -
 referrer
-when
-a
-document
-served
-over
-http
-requires
-an
-http
-sub
--
-resource
-via
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
+-
+http
+origin
+and
+no
 -
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
 referrer
-delivery
-method
-with
-keep
+"
+content
+=
+"
+strict
 -
 origin
 -
-redirect
-and
 when
-the
-target
-request
-is
-same
+-
+cross
 -
 origin
-.
 "
 >
 <
@@ -303,10 +326,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -330,56 +349,44 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
+stripped
 -
-origin
+referrer
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+http
 "
 "
 redirection
 "
 :
 "
-keep
--
-origin
+no
 -
 redirect
 "
 "
-origin
-"
-:
-"
-same
--
-origin
-"
-"
-source_protocol
+source_context_list
 "
 :
+[
+]
 "
-http
-"
-"
-target_protocol
+source_scheme
 "
 :
 "
@@ -395,14 +402,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-stripped
--
-referrer
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..3c7cc3f36cced
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 6e3ad4b87c364..636134daebabf 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -63,7 +65,13 @@
 set
 to
 '
-same
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 '
@@ -73,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -83,14 +101,28 @@
 "
 Check
 that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
 cross
 -
 origin
 subresources
 get
-no
+the
+origin
+portion
+of
+the
 referrer
-information
+URL
 and
 same
 -
@@ -104,21 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -171,7 +188,13 @@
 -
 policy
 -
-same
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
@@ -186,50 +209,50 @@
 content
 =
 "
-The
-referrer
-URL
-is
-omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+Referrer
+Policy
+:
+Expects
+origin
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
-referrer
-delivery
-method
-with
+https
+origin
+and
 keep
 -
 origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
 -
-redirect
-and
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -301,10 +324,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -328,26 +347,24 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
@@ -357,33 +374,21 @@
 keep
 -
 origin
--
-redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-cross
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -393,12 +398,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 82%
rename from testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
rename to testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 32e89ee3045a2..a5eeb1768c420 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -25,11 +25,13 @@
 .
 py
 using
-referrer
+common
+/
+security
 -
-policy
+features
 /
-generic
+tools
 /
 template
 /
@@ -63,7 +65,13 @@
 set
 to
 '
-same
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 '
@@ -73,6 +81,16 @@
 >
 <
 meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
 name
 =
 "
@@ -83,14 +101,28 @@
 "
 Check
 that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
 cross
 -
 origin
 subresources
 get
-no
+the
+origin
+portion
+of
+the
 referrer
-information
+URL
 and
 same
 -
@@ -104,21 +136,6 @@
 "
 >
 <
-meta
-name
-=
-"
-referrer
-"
-content
-=
-"
-same
--
-origin
-"
->
-<
 link
 rel
 =
@@ -171,7 +188,13 @@
 -
 policy
 -
-same
+strict
+-
+origin
+-
+when
+-
+cross
 -
 origin
 "
@@ -186,50 +209,50 @@
 content
 =
 "
-The
-referrer
-URL
-is
-omitted
-when
-a
-document
-served
-over
-http
-requires
-an
-https
-sub
--
-resource
-via
+Referrer
+Policy
+:
+Expects
+origin
+for
 img
 -
 tag
-using
-the
-meta
+to
+same
 -
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
 referrer
-delivery
-method
-with
-swap
+"
+content
+=
+"
+strict
 -
 origin
 -
-redirect
-and
 when
-the
-target
-request
-is
+-
 cross
 -
 origin
-.
 "
 >
 <
@@ -301,10 +324,6 @@
 /
 generic
 /
-referrer
--
-policy
--
 test
 -
 case
@@ -328,62 +347,48 @@
 <
 script
 >
-ReferrerPolicyTestCase
+TestCase
 (
 {
 "
-referrer_policy
+expectation
 "
 :
 "
-same
--
 origin
 "
 "
-delivery_method
+origin
 "
 :
 "
-meta
+same
 -
-referrer
+https
 "
 "
 redirection
 "
 :
 "
-swap
--
-origin
+no
 -
 redirect
 "
 "
-origin
+source_context_list
 "
 :
+[
+]
 "
-cross
--
-origin
-"
-"
-source_protocol
+source_scheme
 "
 :
 "
 http
 "
 "
-target_protocol
-"
-:
-"
-https
-"
-"
 subresource
 "
 :
@@ -393,12 +398,11 @@
 tag
 "
 "
-referrer_url
+subresource_policy_deliveries
 "
 :
-"
-omitted
-"
+[
+]
 }
 document
 .
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..025a36d0925fc
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,455 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+a
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+Otherwise
+cross
+-
+origin
+subresources
+get
+the
+origin
+portion
+of
+the
+referrer
+URL
+and
+same
+-
+origin
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+-
+when
+-
+cross
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..73cb88a0f4913
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..d0f1ae66b4b92
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..52fa57795c41a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..842d18656071b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..b4a6c50e1e6ac
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..0893b02835102
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..851c631c4b2f4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..fdda8f7f2aee9
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..609d396d261b3
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..9d5a60e0c0266
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..1742679d49a3c
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..f4d8f7252a4c4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,429 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+strict
+-
+origin
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+non
+a
+priori
+insecure
+subresource
+gets
+only
+the
+origin
+portion
+of
+the
+referrer
+URL
+.
+A
+priori
+insecure
+subresource
+gets
+no
+referrer
+information
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+strict
+-
+origin
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+origin
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+strict
+-
+origin
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+origin
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..4127fd5e1b33d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..e100e12bb63b4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..cee8c11a19aed
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..02f09d84aefb8
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..7a3af1a006a8c
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..433594cf67f56
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..5b4888a1c4df7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..d4bc00ed81038
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..54e2179b5fe16
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..492c83e602492
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..7c9182c38fef8
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..e6ba3e03cb70a
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,419 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+set
+to
+'
+unsafe
+-
+url
+'
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+all
+sub
+-
+resources
+get
+the
+stripped
+referrer
+URL
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policy
+-
+unsafe
+-
+url
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+meta
+name
+=
+"
+referrer
+"
+content
+=
+"
+unsafe
+-
+url
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 0000000000000..db503a8114bc7
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 0000000000000..2d56d1bb24003
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 0000000000000..b94f71276ac29
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 0000000000000..bc989d057326b
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 0000000000000..3eeead8d07dff
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 0000000000000..5d3f9274d155d
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+cross
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+cross
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 0000000000000..eaf3e7ccdb2e1
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 0000000000000..8ac45640f7ed5
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 0000000000000..2d747a95849e4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+http
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+http
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 0000000000000..93cc80cd1de66
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+keep
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+keep
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 0000000000000..0c6b6313c40a4
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+no
+-
+redirect
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+no
+-
+redirect
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>
diff --git a/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 0000000000000..442f90ebe1cdb
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,405 @@
+<
+!
+DOCTYPE
+html
+>
+<
+!
+-
+-
+DO
+NOT
+EDIT
+!
+Generated
+by
+referrer
+-
+policy
+/
+generic
+/
+tools
+/
+generate
+.
+py
+using
+common
+/
+security
+-
+features
+/
+tools
+/
+template
+/
+test
+.
+release
+.
+html
+.
+template
+.
+-
+-
+>
+<
+html
+>
+<
+head
+>
+<
+title
+>
+Referrer
+-
+Policy
+:
+Referrer
+Policy
+is
+not
+explicitly
+defined
+<
+/
+title
+>
+<
+meta
+charset
+=
+'
+utf
+-
+8
+'
+>
+<
+meta
+name
+=
+"
+description
+"
+content
+=
+"
+Check
+that
+referrer
+URL
+follows
+no
+-
+referrer
+-
+when
+-
+downgrade
+policy
+when
+no
+explicit
+Referrer
+Policy
+is
+set
+.
+"
+>
+<
+link
+rel
+=
+"
+author
+"
+title
+=
+"
+Kristijan
+Burnik
+"
+href
+=
+"
+burnik
+chromium
+.
+org
+"
+>
+<
+link
+rel
+=
+"
+help
+"
+href
+=
+"
+https
+:
+/
+/
+w3c
+.
+github
+.
+io
+/
+webappsec
+-
+referrer
+-
+policy
+/
+#
+referrer
+-
+policies
+"
+>
+<
+meta
+name
+=
+"
+assert
+"
+content
+=
+"
+Referrer
+Policy
+:
+Expects
+stripped
+-
+referrer
+for
+img
+-
+tag
+to
+same
+-
+https
+origin
+and
+swap
+-
+origin
+redirection
+from
+http
+context
+.
+"
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharness
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+resources
+/
+testharnessreport
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+common
+/
+security
+-
+features
+/
+resources
+/
+common
+.
+js
+"
+>
+<
+/
+script
+>
+<
+script
+src
+=
+"
+/
+referrer
+-
+policy
+/
+generic
+/
+test
+-
+case
+.
+sub
+.
+js
+"
+>
+<
+/
+script
+>
+<
+/
+head
+>
+<
+body
+>
+<
+script
+>
+TestCase
+(
+{
+"
+expectation
+"
+:
+"
+stripped
+-
+referrer
+"
+"
+origin
+"
+:
+"
+same
+-
+https
+"
+"
+redirection
+"
+:
+"
+swap
+-
+origin
+"
+"
+source_context_list
+"
+:
+[
+]
+"
+source_scheme
+"
+:
+"
+http
+"
+"
+subresource
+"
+:
+"
+img
+-
+tag
+"
+"
+subresource_policy_deliveries
+"
+:
+[
+]
+}
+document
+.
+querySelector
+(
+"
+meta
+[
+name
+=
+assert
+]
+"
+)
+.
+content
+new
+SanityChecker
+(
+)
+)
+.
+start
+(
+)
+;
+<
+/
+script
+>
+<
+div
+id
+=
+"
+log
+"
+>
+<
+/
+div
+>
+<
+/
+body
+>
+<
+/
+html
+>