Auto merge of #16589 - servo:cssparserup, r=emilio

Update to cssparser 0.13

https://github.com/servo/rust-cssparser/pull/140

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16589)
<!-- Reviewable:end -->

53 files changed, 42 insertions, 180 deletions

diff --git a/Cargo.lock b/Cargo.lock
index bb1d7f6d4f2..2d7a8d0b493 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -281,7 +281,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.15.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -296,7 +296,7 @@ dependencies = [
 name = "canvas_traits"
 version = "0.0.1"
 dependencies = [
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -511,10 +511,10 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -526,7 +526,7 @@ dependencies = [
 
 [[package]]
 name = "cssparser-macros"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -937,7 +937,7 @@ name = "geckoservo"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1359,7 +1359,7 @@ dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
@@ -1666,7 +1666,7 @@ name = "msg"
 version = "0.0.1"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2244,7 +2244,7 @@ dependencies = [
  "caseless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "cookie 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "deny_public_fields 0.0.1",
  "devtools_traits 0.0.1",
  "dom_struct 0.0.1",
@@ -2314,7 +2314,7 @@ dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2385,7 +2385,7 @@ name = "selectors"
 version = "0.18.0"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2735,7 +2735,7 @@ dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2774,7 +2774,7 @@ name = "style_tests"
 version = "0.0.1"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever-atoms 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2793,7 +2793,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2806,7 +2806,7 @@ name = "stylo_tests"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "geckoservo 0.0.1",
@@ -3359,8 +3359,8 @@ dependencies = [
 "checksum core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41115a6aa5d3e1e5ef98148373f25971d1fad53818553f216495f9e67e90a624"
 "checksum core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ead017dcf77f503dc991f6b52de6084eeea60a94b0a652baa9bf88654a28e83f"
 "checksum core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9719616a10f717628e074744f8c55df7b450f7a34d29c196d14f4498aad05d"
-"checksum cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35e3e110221f306501253d8d34857040de365ce2d92ac0abb2f06dedc845d9d0"
-"checksum cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f0415de0bdbce823c0db204e00a62c8240fa2d3e04cd13ff7c6396e4446b95"
+"checksum cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b39404c5e04492194e3c69f1a10964b980f2c95c884a940f7903446779f6b027"
+"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
 "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
 "checksum dbus 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47f881971824401c27bc1ff9f641d54ac66e0f409631806fa7be8cad8e6be450"
 "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3"
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index aef66941282..e24510fec72 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure"}
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 gleam = "0.4"
 ipc-channel = "0.7"
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index 83c7f0a1f5c..512e3366e89 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -10,7 +10,7 @@ name = "canvas_traits"
 path = "lib.rs"
 
 [dependencies]
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 68e5462cbc7..cdeb2f09103 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -14,7 +14,7 @@ app_units = "0.4"
 atomic_refcell = "0.1"
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 fnv = "1.0"
 gfx = {path = "../gfx"}
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 3e873e4d3ad..836190b1ef6 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.7"
-cssparser = "0.12.1"
+cssparser = "0.13"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
 serde = "0.9"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 37d5d7d6224..f145e8f65b0 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -35,7 +35,7 @@ byteorder = "1.0"
 canvas_traits = {path = "../canvas_traits"}
 caseless = "0.1.0"
 cookie = "0.6"
-cssparser = "0.12.1"
+cssparser = "0.13"
 deny_public_fields = {path = "../deny_public_fields"}
 devtools_traits = {path = "../devtools_traits"}
 dom_struct = {path = "../dom_struct"}
diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
index 9db6a37eea0..2df1a3f3205 100644
--- a/components/script_layout_interface/Cargo.toml
+++ b/components/script_layout_interface/Cargo.toml
@@ -13,7 +13,7 @@ path = "lib.rs"
 app_units = "0.4"
 atomic_refcell = "0.1"
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml
index 4410ea922a8..9e5e9df6f35 100644
--- a/components/selectors/Cargo.toml
+++ b/components/selectors/Cargo.toml
@@ -18,7 +18,7 @@ path = "lib.rs"
 [dependencies]
 bitflags = "0.7"
 matches = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 fnv = "1.0"
 precomputed-hash = "0.1"
 smallvec = "0.3"
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 06649f36eeb..54f476b0e73 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -29,7 +29,7 @@ bitflags = "0.7"
 bit-vec = "0.4.3"
 byteorder = "1.0"
 cfg-if = "0.1.0"
-cssparser = "0.12.1"
+cssparser = "0.13.1"
 encoding = {version = "0.2", optional = true}
 euclid = "0.11"
 fnv = "1.0"
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 439829b8f25..9f486772f4c 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -841,7 +841,7 @@ impl PropertyId {
 
         // FIXME(https://github.com/rust-lang/rust/issues/33156): remove this enum and use PropertyId
         // when stable Rust allows destructors in statics.
-        enum StaticId {
+        pub enum StaticId {
             Longhand(LonghandId),
             Shorthand(ShorthandId),
         }
diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
index f61d92029e8..3acba659820 100644
--- a/components/style_traits/Cargo.toml
+++ b/components/style_traits/Cargo.toml
@@ -15,7 +15,7 @@ servo = ["heapsize", "heapsize_derive", "serde", "serde_derive",
 
 [dependencies]
 app_units = "0.4"
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 heapsize = {version = "0.3.0", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index 8148aa27ab9..6cb93fa3466 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -16,7 +16,7 @@ gecko_debug = ["style/gecko_debug"]
 
 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 env_logger = {version = "0.4", default-features = false} # disable `regex` to reduce code size
 libc = "0.2"
 log = {version = "0.3.5", features = ["release_max_level_info"]}
diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
index bba488f0124..4450cb901b4 100644
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@@ -14,7 +14,7 @@ testing = ["style/testing"]
 
 [dependencies]
 app_units = "0.4"
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 html5ever-atoms = "0.3"
 parking_lot = "0.3"
diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml
index b9fff850359..239763a6866 100644
--- a/tests/unit/stylo/Cargo.toml
+++ b/tests/unit/stylo/Cargo.toml
@@ -16,7 +16,7 @@ testing = ["style/testing"]
 
 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 env_logger = "0.4"
 euclid = "0.11"
 libc = "0.2"
diff --git a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.htm.ini b/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.htm.ini
index e81798facf7..b5188507ca0 100644
--- a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.htm.ini
+++ b/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.htm.ini
@@ -2,4 +2,3 @@
   type: reftest
   expected:
     if os == "linux": FAIL
-
diff --git a/tests/wpt/metadata-css/css-color-3_dev/html4/t424-hsl-parsing-f.htm.ini b/tests/wpt/metadata-css/css-color-3_dev/html4/t424-hsl-parsing-f.htm.ini
new file mode 100644
index 00000000000..0ea47c559e7
--- /dev/null
+++ b/tests/wpt/metadata-css/css-color-3_dev/html4/t424-hsl-parsing-f.htm.ini
@@ -0,0 +1,3 @@
+[t424-hsl-parsing-f.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-parsing-f.htm.ini b/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-parsing-f.htm.ini
new file mode 100644
index 00000000000..08d8a826514
--- /dev/null
+++ b/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-parsing-f.htm.ini
@@ -0,0 +1,3 @@
+[t425-hsla-parsing-f.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
index b840beb7362..2838a64d8f4 100644
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
+++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
@@ -2,4 +2,3 @@
   type: reftest
   expected:
     if os == "linux": FAIL
-
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini
index 84145f2ac0b..8e2a7b49f90 100644
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini
+++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini
@@ -2,4 +2,3 @@
   type: reftest
   expected:
     if os == "linux": FAIL
-
diff --git a/tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-014.htm.ini b/tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-014.htm.ini
index 689b761d56b..c45dcc7cec4 100644
--- a/tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-014.htm.ini
+++ b/tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-014.htm.ini
@@ -1,4 +1,5 @@
 [css3-selectors-lang-014.htm]
   type: testharness
   [A :lang value with language and region subtags will NOT match a lang attribute value with language, script and region subtags.]
-    expected: FAIL
\ No newline at end of file
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-014.xht.ini b/tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-014.xht.ini
index c62441a9a7b..0bd9ecbd9c8 100644
--- a/tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-014.xht.ini
+++ b/tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-014.xht.ini
@@ -2,3 +2,4 @@
   type: testharness
   [A :lang value with language and region subtags will NOT match a lang attribute value with language, script and region subtags.]
     expected: FAIL
+
diff --git a/tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-014.xht.ini b/tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-014.xht.ini
index c62441a9a7b..0bd9ecbd9c8 100644
--- a/tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-014.xht.ini
+++ b/tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-014.xht.ini
@@ -2,3 +2,4 @@
   type: testharness
   [A :lang value with language and region subtags will NOT match a lang attribute value with language, script and region subtags.]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html.ini
deleted file mode 100644
index 0a475462eca..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-1.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html.ini
deleted file mode 100644
index 315f1b77815..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-2.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-2]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html.ini
deleted file mode 100644
index 6d0c4fe4879..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-3.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-3]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html.ini
deleted file mode 100644
index f13a1878cb0..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-4.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-4]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini
deleted file mode 100644
index b3b4fa258ea..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-5.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-5]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html.ini
deleted file mode 100644
index 979b13418d2..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-6.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-6]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html.ini
deleted file mode 100644
index 346881a91d3..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-7.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-7]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html.ini
deleted file mode 100644
index 77331fbc02a..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-8.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-8]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html.ini
deleted file mode 100644
index f06dce0fa82..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsl-9.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsl-9]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html.ini
deleted file mode 100644
index 07eff7c118c..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-1.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html.ini
deleted file mode 100644
index 2074d83d9c5..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-2.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-2]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html.ini
deleted file mode 100644
index 629b598de19..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-3.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-3]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html.ini
deleted file mode 100644
index 5ecb867f752..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-4.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-4]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html.ini
deleted file mode 100644
index 73ec9374c24..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-5.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-5]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html.ini
deleted file mode 100644
index 2a9e01d706c..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-6.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-6]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html.ini
deleted file mode 100644
index 84cb1a69296..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-7.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-7]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html.ini
deleted file mode 100644
index 5736436b063..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-8.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-8]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html.ini
deleted file mode 100644
index 684d29b06c4..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-hsla-9.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-hsla-9]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html.ini
deleted file mode 100644
index ccef8774341..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgb-1.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgb-1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html.ini
deleted file mode 100644
index 01bb5fd598c..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgb-2.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgb-2]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html.ini
deleted file mode 100644
index 4f27a04d6ec..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgb-3.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgb-3]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html.ini
deleted file mode 100644
index 25e2f86c36e..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgb-4.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgb-4]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html.ini
deleted file mode 100644
index 0c9af172107..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgb-5.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgb-5]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html.ini
deleted file mode 100644
index 2e9d183a6ee..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgb-6.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgb-6]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html.ini
deleted file mode 100644
index 774515ed0f0..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgba-1.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgba-1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html.ini
deleted file mode 100644
index 2059cb3cdc8..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgba-3.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgba-3]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html.ini
deleted file mode 100644
index 66054fea435..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgba-4.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgba-4]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html.ini
deleted file mode 100644
index f1886f1771a..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgba-5.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgba-5]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html.ini
deleted file mode 100644
index a45a7f41e47..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.fillStyle.parse.css-color-4-rgba-6.html]
-  type: testharness
-  [Canvas test: 2d.fillStyle.parse.css-color-4-rgba-6]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/dom/nodes/Document-constructor.html.ini b/tests/wpt/metadata/dom/nodes/Document-constructor.html.ini
index 95d61e5bf50..d86bc27bc9a 100644
--- a/tests/wpt/metadata/dom/nodes/Document-constructor.html.ini
+++ b/tests/wpt/metadata/dom/nodes/Document-constructor.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [new Document(): URL parsing]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini
index 42c964913f8..798eb1b49b7 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini
@@ -1,6 +1,6 @@
 [methods.html]
   type: testharness
-  [WebGL test #0: Property either does not exist or is not a function: getAttachedShaders] 
+  [WebGL test #0: Property either does not exist or is not a function: getAttachedShaders]
     expected: FAIL
 
   [WebGL test #1: Property either does not exist or is not a function: getFramebufferAttachmentParameter]