From 154b5fd6da3747a4280a4def72c03ea28ee09df1 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Wed, 29 Jul 2015 12:04:26 -0600
Subject: [PATCH] Update to latest rust-cssparser.

This also updates wpt tests for new CSS Level 4 color parsing, and
disables the relevant CSS tests until they can be updated (tracked
by #6856).
---
 components/servo/Cargo.lock                   |  18 +++++-----
 ports/cef/Cargo.lock                          |  16 ++++-----
 ports/gonk/Cargo.lock                         |  16 ++++-----
 .../html4/border-bottom-color-030.htm.ini     |   3 ++
 .../html4/border-left-color-030.htm.ini       |   3 ++
 .../html4/border-right-color-030.htm.ini      |   3 ++
 .../html4/border-top-color-030.htm.ini        |   3 ++
 tests/wpt/metadata/MANIFEST.json              |  26 +++++++++++++--
 tests/wpt/mozilla/meta/MANIFEST.json          |  12 -------
 .../2d.fillStyle.parse.hex4.html              |  31 ++++++++++++++++++
 .../2d.fillStyle.parse.hex4.png               | Bin 0 -> 205 bytes
 .../2d.fillStyle.parse.hex8.html              |  31 ++++++++++++++++++
 .../2d.fillStyle.parse.hex8.png               | Bin 0 -> 205 bytes
 .../2d.fillStyle.parse.invalid.hex4.html      |   2 +-
 .../2d.fillStyle.parse.invalid.hex8.html      |   2 +-
 .../2dcontext/tools/tests2d.yaml              |   6 ++--
 16 files changed, 129 insertions(+), 43 deletions(-)
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-030.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-left-color-030.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-right-color-030.htm.ini
 create mode 100644 tests/wpt/metadata-css/css21_dev/html4/border-top-color-030.htm.ini
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 39bc855a636f..824110393750 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -87,7 +87,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "gleam 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -104,7 +104,7 @@ name = "canvas_traits"
 version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -225,7 +225,7 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -727,7 +727,7 @@ dependencies = [
  "canvas 0.0.1",
  "canvas_traits 0.0.1",
  "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1171,7 +1171,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas 0.0.1",
  "canvas_traits 0.0.1",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1237,7 +1237,7 @@ version = "0.1.0"
 source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5"
 dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1356,7 +1356,7 @@ name = "style"
 version = "0.0.1"
 dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1380,7 +1380,7 @@ dependencies = [
 name = "style_tests"
 version = "0.0.1"
 dependencies = [
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1486,7 +1486,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 933ed52e8392..b53543843f2b 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -91,7 +91,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "gleam 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -108,7 +108,7 @@ name = "canvas_traits"
 version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -229,7 +229,7 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -724,7 +724,7 @@ dependencies = [
  "canvas 0.0.1",
  "canvas_traits 0.0.1",
  "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1155,7 +1155,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas 0.0.1",
  "canvas_traits 0.0.1",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1213,7 +1213,7 @@ version = "0.1.0"
 source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5"
 dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1358,7 +1358,7 @@ name = "style"
 version = "0.0.1"
 dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1474,7 +1474,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 21d679c40393..2d0e1a8bc1fc 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -73,7 +73,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "gleam 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -90,7 +90,7 @@ name = "canvas_traits"
 version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -200,7 +200,7 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -652,7 +652,7 @@ dependencies = [
  "canvas 0.0.1",
  "canvas_traits 0.0.1",
  "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1057,7 +1057,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas 0.0.1",
  "canvas_traits 0.0.1",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1115,7 +1115,7 @@ version = "0.1.0"
 source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5"
 dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1250,7 +1250,7 @@ name = "style"
 version = "0.0.1"
 dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1357,7 +1357,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-030.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-030.htm.ini
new file mode 100644
index 000000000000..68e92bf93fa1
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-030.htm.ini
@@ -0,0 +1,3 @@
+[border-bottom-color-030.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-color-030.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-left-color-030.htm.ini
new file mode 100644
index 000000000000..1983d2da3e57
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-left-color-030.htm.ini
@@ -0,0 +1,3 @@
+[border-left-color-030.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-right-color-030.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-right-color-030.htm.ini
new file mode 100644
index 000000000000..264be095edf5
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-right-color-030.htm.ini
@@ -0,0 +1,3 @@
+[border-right-color-030.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-color-030.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-color-030.htm.ini
new file mode 100644
index 000000000000..135bb3e37170
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-top-color-030.htm.ini
@@ -0,0 +1,3 @@
+[border-top-color-030.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 2b24fcb09c62..4d42cd9f091b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -28856,8 +28856,30 @@
     ]
   },
   "local_changes": {
-    "deleted": [],
-    "items": {},
+    "deleted": [
+      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html",
+      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html",
+      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html",
+      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html",
+      "2dcontext/transformations/canvas_transformations_reset_001.htm",
+      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html"
+    ],
+    "items": {
+      "testharness": {
+        "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html": [
+          {
+            "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html",
+            "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html"
+          }
+        ],
+        "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html": [
+          {
+            "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html",
+            "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html"
+          }
+        ]
+      }
+    },
     "reftest_nodes": {}
   },
   "reftest_nodes": {
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 075f3da0da4a..a674d8a4203f 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -63,18 +63,6 @@
             "url": "/_mozilla/css/absolute_hypothetical_float.html"
           }
         ],
-        "css/empty_pseudo_selector.html": [
-          {
-            "path": "css/empty_pseudo_selector.html",
-            "references": [
-              [
-                "/_mozilla/css/empty_pseudo_selector_ref.html",
-                "=="
-              ]
-            ],
-            "url": "/_mozilla/css/empty_pseudo_selector.html"
-          }
-        ],
         "css/class-namespaces.html": [
           {
             "path": "css/class-namespaces.html",
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html
new file mode 100644
index 000000000000..8462248e819b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
+<title>Canvas test: 2d.fillStyle.parse.hex4</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/canvas-tests.js"></script>
+<link rel="stylesheet" href="/common/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.fillStyle.parse.hex4</h1>
+<p class="desc"></p>
+
+<p class="notes">
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<p class="output expectedtext">Expected output:<p><img src="2d.fillStyle.parse.hex4.png" class="output expected" id="expected" alt="">
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = '#0f0f';
+ctx.fillRect(0, 0, 100, 50);
+_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+
+
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png
new file mode 100644
index 0000000000000000000000000000000000000000..2733836c998fa919d9f6880fd96a32026e82ca2c
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*!2~2#!(YAxQfx`y?k)`fL2$v|<&%LTO`a}}
zAsLNtFF0~CC@>sw*jk^y_CcJ|9aV|h$^3e2uQS>kY8%iLTDVVOOukmV+zsd&22WQ%
Jmvv4FO#p%IF~$G@

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
new file mode 100644
index 000000000000..36ade5748c5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
+<title>Canvas test: 2d.fillStyle.parse.hex8</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/canvas-tests.js"></script>
+<link rel="stylesheet" href="/common/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.fillStyle.parse.hex8</h1>
+<p class="desc"></p>
+
+<p class="notes">
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<p class="output expectedtext">Expected output:<p><img src="2d.fillStyle.parse.hex8.png" class="output expected" id="expected" alt="">
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = '#00ff00ff';
+ctx.fillRect(0, 0, 100, 50);
+_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+
+
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png
new file mode 100644
index 0000000000000000000000000000000000000000..2733836c998fa919d9f6880fd96a32026e82ca2c
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*!2~2#!(YAxQfx`y?k)`fL2$v|<&%LTO`a}}
zAsLNtFF0~CC@>sw*jk^y_CcJ|9aV|h$^3e2uQS>kY8%iLTDVVOOukmV+zsd&22WQ%
Jmvv4FO#p%IF~$G@

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
index 5307cd4184c8..36e312d63bf4 100644
--- a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
@@ -21,7 +21,7 @@ <h1>2d.fillStyle.parse.invalid.hex4</h1>
 
 
 ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '#ff00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+try { ctx.fillStyle = '#fg00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
index 11b11ce0ccfb..e835d2da0617 100644
--- a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
@@ -21,7 +21,7 @@ <h1>2d.fillStyle.parse.invalid.hex8</h1>
 
 
 ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '#ff0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+try { ctx.fillStyle = '#fg0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 
diff --git a/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml b/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml
index 2c8dc3078ebb..528e23e130f0 100644
--- a/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml
+++ b/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml
@@ -1329,7 +1329,9 @@
     for name, string, r,g,b,a, notes in [
         ('html4', 'limE', 0,255,0,255, ""),
         ('hex3', '#0f0', 0,255,0,255, ""),
+        ('hex4', '#0f0f', 0,255,0,255, ""),
         ('hex6', '#00fF00', 0,255,0,255, ""),
+        ('hex8', '#00ff00ff', 0,255,0,255, ""),
         ('rgb-num', 'rgb(0,255,0)', 0,255,0,255, ""),
         ('rgb-clamp-1', 'rgb(-1000, 1000, -1000)', 0,255,0,255, 'Assumes colours are clamped to [0,255].'),
         ('rgb-clamp-2', 'rgb(-200%, 200%, -200%)', 0,255,0,255, 'Assumes colours are clamped to [0,255].'),
@@ -1397,11 +1399,11 @@
         ('hex1', '#f'),
         ('hex2', '#f0'),
         ('hex3', '#g00'),
-        ('hex4', '#ff00'),
+        ('hex4', '#fg00'),
         ('hex5', '#ff000'),
         ('hex6', '#fg0000'),
         ('hex7', '#ff0000f'),
-        ('hex8', '#ff0000ff'),
+        ('hex8', '#fg0000ff'),
         ('rgb-1', 'rgb(255.0, 0, 0)'),
         ('rgb-2', 'rgb(255, 0.0, 0)'),
         ('rgb-3', 'rgb(255.0, 0, 0,)'),