From 9b0b03a432aa00838245e4887524302d3a8fa71c Mon Sep 17 00:00:00 2001
From: Utsav Oza <utsavoza96@gmail.com>
Date: Tue, 19 May 2020 16:32:10 +0530
Subject: [PATCH] Update wpt-tests metadata

---
 components/script/dom/blob.rs                 |  1 -
 components/script/dom/document.rs             |  1 -
 components/script/dom/url.rs                  |  2 +-
 .../FileAPI/url/sandboxed-iframe.html.ini     | 39 +++++++++++++++++++
 .../FileAPI/url/url-format.any.js.ini         |  7 ----
 .../viewport-units-after-font-load.html.ini   |  5 ---
 ...gling-markup-mitigation.tentative.html.ini | 34 ++--------------
 .../the-base-element/base_srcdoc.html.ini     |  5 ---
 ...oad_allow_downloads.sub.tentative.html.ini |  5 ++-
 ...oad_block_downloads.sub.tentative.html.ini |  3 ++
 ...oad_allow_downloads.sub.tentative.html.ini |  5 ++-
 ...oad_block_downloads.sub.tentative.html.ini |  3 ++
 .../move-element-and-scroll.html.ini          |  2 +
 .../sizes/sizes-dynamic-001-ref.html.ini      |  2 +
 .../sizes/sizes-dynamic-001.html.ini          |  2 +
 ...ndboxed-iframe-with-opaque-origin.html.ini |  6 +--
 16 files changed, 62 insertions(+), 60 deletions(-)
 delete mode 100644 tests/wpt/metadata/css/css-values/viewport-units-after-font-load.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_srcdoc.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini

diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs
index aba1b99ab5e..46203a031b5 100644
--- a/components/script/dom/blob.rs
+++ b/components/script/dom/blob.rs
@@ -60,7 +60,6 @@ impl Blob {
         blobParts: Option<Vec<ArrayBufferOrArrayBufferViewOrBlobOrString>>,
         blobPropertyBag: &BlobBinding::BlobPropertyBag,
     ) -> Fallible<DomRoot<Blob>> {
-        // TODO: accept other blobParts types - ArrayBuffer or ArrayBufferView
         let bytes: Vec<u8> = match blobParts {
             None => Vec::new(),
             Some(blobparts) => match blob_parts_to_bytes(blobparts) {
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 6f1656d1baf..0a54cf7d9cf 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -586,7 +586,6 @@ impl Document {
             if document_url.as_str() == "about:srcdoc" && container_base_url.is_some() {
                 return container_base_url.unwrap();
             }
-
             // Step 2: If document's URL is about:blank, and document's browsing
             // context's creator base URL is non-null, then return that creator base URL.
             if document_url.as_str() == "about:blank" && browsing_context.has_creator_base_url() {
diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs
index b1ceef7cfa3..056f6aa9643 100644
--- a/components/script/dom/url.rs
+++ b/components/script/dom/url.rs
@@ -155,7 +155,7 @@ impl URL {
         result.push('/');
 
         // Step 5
-        result.push_str(&id.to_simple().to_string());
+        result.push_str(&id.to_string());
 
         result
     }
diff --git a/tests/wpt/metadata/FileAPI/url/sandboxed-iframe.html.ini b/tests/wpt/metadata/FileAPI/url/sandboxed-iframe.html.ini
index 3e33fa10885..5119506bbc8 100644
--- a/tests/wpt/metadata/FileAPI/url/sandboxed-iframe.html.ini
+++ b/tests/wpt/metadata/FileAPI/url/sandboxed-iframe.html.ini
@@ -1,4 +1,43 @@
 [sandboxed-iframe.html]
   expected: TIMEOUT
+  [Blob URLs can be used in <script> tags]
+    expected: TIMEOUT
 
+  [Blob URLs can be used in iframes, and are treated same origin]
+    expected: FAIL
 
+  [Blob URL fragment is implemented.]
+    expected: TIMEOUT
+
+  [Blob URLs can be used in XHR]
+    expected: FAIL
+
+  [XHR with a fragment should succeed]
+    expected: FAIL
+
+  [Only exact matches should revoke URLs, using XHR]
+    expected: FAIL
+
+  [Revoke blob URL after open(), will fetch]
+    expected: FAIL
+
+  [Blob URLs can be used in fetch]
+    expected: FAIL
+
+  [fetch with a fragment should succeed]
+    expected: FAIL
+
+  [Only exact matches should revoke URLs, using fetch]
+    expected: FAIL
+
+  [fetch should return Content-Type from Blob]
+    expected: FAIL
+
+  [Revoke blob URL after creating Request, will fetch]
+    expected: FAIL
+
+  [Revoke blob URL after calling fetch, fetch should succeed]
+    expected: FAIL
+
+  [XHR should return Content-Type from Blob]
+    expected: FAIL
diff --git a/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini
index d7305ce3f96..9f19055d048 100644
--- a/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-format.any.js.ini
@@ -2,14 +2,7 @@
   [Generated Blob URLs are unique]
     expected: FAIL
 
-  [Blob URL parses correctly]
-    expected: FAIL
-
 
 [url-format.any.html]
   [Generated Blob URLs are unique]
     expected: FAIL
-
-  [Blob URL parses correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/viewport-units-after-font-load.html.ini b/tests/wpt/metadata/css/css-values/viewport-units-after-font-load.html.ini
deleted file mode 100644
index 5ac32f7d317..00000000000
--- a/tests/wpt/metadata/css/css-values/viewport-units-after-font-load.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[viewport-units-after-font-load.html]
-  expected: TIMEOUT
-  [Viewport units are correctly updated after resize even if a font load has happened before]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/fetch/security/dangling-markup-mitigation.tentative.html.ini b/tests/wpt/metadata/fetch/security/dangling-markup-mitigation.tentative.html.ini
index ea5bbc8a33b..bb3b1f4f399 100644
--- a/tests/wpt/metadata/fetch/security/dangling-markup-mitigation.tentative.html.ini
+++ b/tests/wpt/metadata/fetch/security/dangling-markup-mitigation.tentative.html.ini
@@ -18,39 +18,11 @@
   [Fetch: /images/green-1x1.png?<\\t=block]
     expected: FAIL
 
-  [<img id="dangling" src="/images/green-1x1.png?img=&lt;b">]
+  [<img id="dangling" src="/images/green-1x1.png?img=&#10;&lt;b">]
     expected: FAIL
 
-  [<img id="dangling" src="/images/green-1x1.png?img=&#10;b">]
+  [<img id="dangling" src="/images/green-1x1.png?img=&lt;&#10;b">]
     expected: FAIL
 
-  [<img id="dangling" src="/images/green-1x1.png?img=&amp;#10;b">]
+  [\\n      <img id="dangling" src="/images/green-1x1.png?img=\\n        &lt;\\n        &#10;b\\n      ">\\n    ]
     expected: FAIL
-
-  [<img id="dangling" src="/images/green-1x1.png?img=&amp;lt;b">]
-    expected: FAIL
-
-  [<img id="dangling" src="/images/green-1x1.png?img=&amp;#10;b&amp;lt;c">]
-    expected: FAIL
-
-  [\\n      <img id="dangling" src="\\n        /images/green-1x1.png?img=\\n      ">\\n    ]
-    expected: FAIL
-
-  [\\n      <img id="dangling" src="\\n        /images/green-1x1.png?img=&amp;lt;\\n      ">\\n    ]
-    expected: FAIL
-
-  [\\n      <img id="dangling" src="\\n        /images/green-1x1.png?img=&amp;#10;\\n      ">\\n    ]
-    expected: FAIL
-
-  [<img id="dangling" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=">]
-    expected: FAIL
-
-  [<img id="dangling" src="data:image/png;base64,&#10;iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=">]
-    expected: FAIL
-
-  [<img id="dangling" src="data:image/png;base64,i&#10;VBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=">]
-    expected: FAIL
-
-  [<img id="dangling" src="data:image/svg+xml;utf8,\\n      <svg width='1' height='1' xmlns='http://www.w3.org/2000/svg'>\\n        <rect width='100%' height='100%' fill='rebeccapurple'/>\\n        <rect x='10%' y='10%' width='80%' height='80%' fill='lightgreen'/>\\n      </svg>">]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_srcdoc.html.ini b/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_srcdoc.html.ini
deleted file mode 100644
index 50454124488..00000000000
--- a/tests/wpt/metadata/html/semantics/document-metadata/the-base-element/base_srcdoc.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[base_srcdoc.html]
-  type: testharness
-  [base element in srcdoc document should resolve against its fallback base URI]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.sub.tentative.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.sub.tentative.html.ini
index 30a7275385a..a6a9c252106 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.sub.tentative.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.sub.tentative.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_anchor_download_allow_downloads.sub.tentative.html]
-  expected: TIMEOUT
   [<a download> triggered download in sandbox is allowed by allow-downloads.]
-    expected: TIMEOUT
+    expected: FAIL
 
+  [<a download> triggered download in sandbox is blocked]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
new file mode 100644
index 00000000000..74b7ec3926f
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html.ini
@@ -0,0 +1,3 @@
+[iframe_sandbox_anchor_download_block_downloads.sub.tentative.html]
+  [<a download> triggered download in sandbox is blocked.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
index c98551372ad..9a2b8fdb7e7 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html]
-  expected: TIMEOUT
   [Navigation resulted download in sandbox is allowed by allow-downloads.]
-    expected: TIMEOUT
+    expected: FAIL
 
+  [Navigation resulted download in sandbox is blocked.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html.ini
new file mode 100644
index 00000000000..3aecd7a18cc
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html.ini
@@ -0,0 +1,3 @@
+[iframe_sandbox_navigation_download_block_downloads.sub.tentative.html]
+  [Navigation resulted download in sandbox is blocked.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html.ini
index 5617e1739bf..e8b32f8a314 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html.ini
@@ -1,2 +1,4 @@
 [move-element-and-scroll.html]
   expected: ERROR
+  [Test that <img> below viewport is not loaded when moved to another document and then scrolled to]
+    expected: FAIL
\ No newline at end of file
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html.ini
new file mode 100644
index 00000000000..6e14783f3da
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html.ini
@@ -0,0 +1,2 @@
+[sizes-dynamic-001-ref.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini
new file mode 100644
index 00000000000..e3f00793794
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini
@@ -0,0 +1,2 @@
+[sizes-dynamic-001.html]
+  expected: FAIL
\ No newline at end of file
diff --git a/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini b/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
index d76c9d0e9b4..78ba38962bb 100644
--- a/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
@@ -1,9 +1,5 @@
 [sandboxed-iframe-with-opaque-origin.html]
   type: testharness
-  expected: TIMEOUT
-  [Sandboxed iframe with opaque origin doesn't send referrers.]
-    expected: TIMEOUT
-
   [Sandboxed iframe with tuple origin sends referrers.]
-    expected: TIMEOUT
+    expected: FAIL