From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../css/css-scrollbars/scrollbar-color-001.html    |  62 +++++++++++
 .../scrollbar-color-001.tentative.html             |  62 -----------
 .../css/css-scrollbars/scrollbar-color-002.html    |  55 ++++++++++
 .../scrollbar-color-002.tentative.html             |  55 ----------
 .../css/css-scrollbars/scrollbar-color-003.html    |  89 ++++++++++++++++
 .../scrollbar-color-003.tentative.html             |  89 ----------------
 .../css/css-scrollbars/scrollbar-color-004.html    |  60 +++++++++++
 .../scrollbar-color-004.tentative.html             |  60 -----------
 .../css/css-scrollbars/scrollbar-color-005.html    |  60 +++++++++++
 .../scrollbar-color-005.tentative.html             |  60 -----------
 .../css/css-scrollbars/scrollbar-color-006.html    |  33 ++++++
 .../scrollbar-color-006.tentative.html             |  33 ------
 .../css/css-scrollbars/scrollbar-color-007.html    |  33 ++++++
 .../scrollbar-color-007.tentative.html             |  33 ------
 .../css/css-scrollbars/scrollbar-color-008.html    |  36 +++++++
 .../scrollbar-color-008.tentative.html             |  36 -------
 .../css/css-scrollbars/scrollbar-color-009.html    |  20 ++++
 .../scrollbar-color-009.tentative.html             |  20 ----
 .../css/css-scrollbars/scrollbar-color-010.html    |  20 ++++
 .../scrollbar-color-010.tentative.html             |  20 ----
 .../css-scrollbars/scrollbar-color-dynamic-8.html  |  29 ++++++
 .../scrollbar-color-dynamic-8.tentative.html       |  29 ------
 .../css/css-scrollbars/scrollbar-width-010.html    |  62 +++++++++++
 .../scrollbar-width-010.tentative.html             |  62 -----------
 .../css/css-scrollbars/scrollbar-width-011.html    |  55 ++++++++++
 .../scrollbar-width-011.tentative.html             |  55 ----------
 .../css/css-scrollbars/scrollbar-width-012.html    |  56 ++++++++++
 .../scrollbar-width-012.tentative.html             |  56 ----------
 .../css/css-scrollbars/scrollbar-width-013.html    |  55 ++++++++++
 .../scrollbar-width-013.tentative.html             |  55 ----------
 .../css/css-scrollbars/scrollbar-width-014.html    |  62 +++++++++++
 .../scrollbar-width-014.tentative.html             |  62 -----------
 .../css/css-scrollbars/scrollbar-width-015.html    |  87 ++++++++++++++++
 .../scrollbar-width-015.tentative.html             |  87 ----------------
 .../css/css-scrollbars/scrollbar-width-016.html    | 114 +++++++++++++++++++++
 .../scrollbar-width-016.tentative.html             | 114 ---------------------
 36 files changed, 988 insertions(+), 988 deletions(-)
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.tentative.html
 create mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.html
 delete mode 100644 testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.tentative.html

(limited to 'testing/web-platform/tests/css/css-scrollbars')

diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.html
new file mode 100644
index 0000000000..eff8667531
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-color auto on the root defers to ::-webkit-scrollbar</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  :root {
+    scrollbar-color: auto;
+  }
+
+  :root::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
+  @supports not selector(::-webkit-scrollbar) {
+    :root {
+      overflow: hidden;
+    }
+  }
+
+  :root,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  #content {
+    height: 10vh;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  #expander {
+    /* force vertical scroll */
+    height: 200vh;
+    width: 300px;
+    background: gray;
+  }
+</style>
+
+<body>
+
+  <div id="content"></div>
+
+  <div id="expander"></div>
+
+  <script>
+    test(function () {
+      let root = document.documentElement;
+      let body = document.body;
+      let content = document.getElementById('content');
+
+      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
+      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
+      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
+    }, "scrollbar-color auto on the root defers to ::-webkit-scrollbar");
+  </script>
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.tentative.html
deleted file mode 100644
index c056990934..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-001.tentative.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-color auto on the root defers to ::-webkit-scrollbar</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  :root {
-    scrollbar-color: auto;
-  }
-
-  :root::-webkit-scrollbar {
-    display: none;
-  }
-
-  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
-  @supports not selector(::-webkit-scrollbar) {
-    :root {
-      overflow: hidden;
-    }
-  }
-
-  :root,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-
-  #content {
-    height: 10vh;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  #expander {
-    /* force vertical scroll */
-    height: 200vh;
-    width: 300px;
-    background: gray;
-  }
-</style>
-
-<body>
-
-  <div id="content"></div>
-
-  <div id="expander"></div>
-
-  <script>
-    test(function () {
-      let root = document.documentElement;
-      let body = document.body;
-      let content = document.getElementById('content');
-
-      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
-      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
-      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
-    }, "scrollbar-color auto on the root defers to ::-webkit-scrollbar");
-  </script>
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.html
new file mode 100644
index 0000000000..1dfc63d68e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.html
@@ -0,0 +1,55 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-color non-auto on the root overrides ::-webkit-scrollbar</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  :root {
+    scrollbar-color: yellow blue;
+  }
+
+  :root::-webkit-scrollbar {
+    display: none;
+  }
+
+  :root,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  #content {
+    height: 10vh;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  #expander {
+    /* force vertical scroll */
+    height: 200vh;
+    width: 300px;
+    background: gray;
+  }
+</style>
+
+<body>
+
+  <div id="content"></div>
+
+  <div id="expander"></div>
+
+  <script>
+    test(function () {
+      let root = document.documentElement;
+      let body = document.body;
+      let content = document.getElementById('content');
+
+      assert_less_than(root.offsetWidth, window.innerWidth, "viewport has a scrollbar");
+      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
+      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
+    }, "scrollbar-color non-auto on the root overrides ::-webkit-scrollbar");
+  </script>
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.tentative.html
deleted file mode 100644
index 70bfa5586d..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-002.tentative.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-color non-auto on the root overrides ::-webkit-scrollbar</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  :root {
-    scrollbar-color: yellow blue;
-  }
-
-  :root::-webkit-scrollbar {
-    display: none;
-  }
-
-  :root,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-
-  #content {
-    height: 10vh;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  #expander {
-    /* force vertical scroll */
-    height: 200vh;
-    width: 300px;
-    background: gray;
-  }
-</style>
-
-<body>
-
-  <div id="content"></div>
-
-  <div id="expander"></div>
-
-  <script>
-    test(function () {
-      let root = document.documentElement;
-      let body = document.body;
-      let content = document.getElementById('content');
-
-      assert_less_than(root.offsetWidth, window.innerWidth, "viewport has a scrollbar");
-      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
-      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
-    }, "scrollbar-color non-auto on the root overrides ::-webkit-scrollbar");
-  </script>
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.html
new file mode 100644
index 0000000000..1dc3c64f79
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.html
@@ -0,0 +1,89 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-color on scrollable areas correctly interacts with ::-webkit-scrollbar on container</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .container {
+    overflow: auto;
+    height: 200px;
+    width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  .container.auto {
+    scrollbar-color: auto;
+  }
+
+  .container.auto::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
+  @supports not selector(::-webkit-scrollbar) {
+    .container.auto {
+      overflow: hidden;
+    }
+  }
+
+  .container.themed {
+    scrollbar-color: yellow blue;
+  }
+
+  .container.themed::-webkit-scrollbar {
+    display: none;
+  }
+</style>
+<script>
+  function performTest() {
+    setup({ explicit_done: true });
+
+    test(function () {
+      let container = document.getElementById('container_auto');
+      let content = document.getElementById('content_auto');
+      assert_equals(container.scrollWidth, 200, "auto scrollWidth");
+      assert_equals(container.clientWidth, 200, "auto clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "auto offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "auto clientWidth");
+      assert_equals(container.offsetWidth, content.offsetWidth, "auto offsetWidth");
+    }, "scrollbar-color auto defers to ::-webkit-scrollbar");
+
+    test(function () {
+      let container = document.getElementById('container_themed');
+      let content = document.getElementById('content_themed');
+      assert_less_than(container.scrollWidth, container.offsetWidth, "themed scrollWidth");
+      assert_less_than(container.clientWidth, container.offsetWidth, "themed clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "themed offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "themed clientWidth");
+      assert_not_equals(container.offsetWidth, content.offsetWidth, "themed offsetWidth");
+    }, "scrollbar-color yellow blue overrides ::-webkit-scrollbar");
+
+    done();
+  }
+</script>
+
+<body onload="performTest()">
+
+  Test scrollbar-color: vertical scrollbar
+
+  <div class="container auto" id="container_auto">
+    <div class="content" id="content_auto">auto</div>
+  </div>
+
+  <div class="container themed" id="container_themed">
+    <div class="content" id="content_themed">themed</div>
+  </div>
+
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.tentative.html
deleted file mode 100644
index 3fb42bedea..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-003.tentative.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-color on scrollable areas correctly interacts with ::-webkit-scrollbar on container</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  .container {
-    overflow: auto;
-    height: 200px;
-    width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-  }
-
-  .content {
-    height: 300px;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  .container.auto {
-    scrollbar-color: auto;
-  }
-
-  .container.auto::-webkit-scrollbar {
-    display: none;
-  }
-
-  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
-  @supports not selector(::-webkit-scrollbar) {
-    .container.auto {
-      overflow: hidden;
-    }
-  }
-
-  .container.themed {
-    scrollbar-color: yellow blue;
-  }
-
-  .container.themed::-webkit-scrollbar {
-    display: none;
-  }
-</style>
-<script>
-  function performTest() {
-    setup({ explicit_done: true });
-
-    test(function () {
-      let container = document.getElementById('container_auto');
-      let content = document.getElementById('content_auto');
-      assert_equals(container.scrollWidth, 200, "auto scrollWidth");
-      assert_equals(container.clientWidth, 200, "auto clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "auto offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "auto clientWidth");
-      assert_equals(container.offsetWidth, content.offsetWidth, "auto offsetWidth");
-    }, "scrollbar-color auto defers to ::-webkit-scrollbar");
-
-    test(function () {
-      let container = document.getElementById('container_themed');
-      let content = document.getElementById('content_themed');
-      assert_less_than(container.scrollWidth, container.offsetWidth, "themed scrollWidth");
-      assert_less_than(container.clientWidth, container.offsetWidth, "themed clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "themed offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "themed clientWidth");
-      assert_not_equals(container.offsetWidth, content.offsetWidth, "themed offsetWidth");
-    }, "scrollbar-color yellow blue overrides ::-webkit-scrollbar");
-
-    done();
-  }
-</script>
-
-<body onload="performTest()">
-
-  Test scrollbar-color: vertical scrollbar
-
-  <div class="container auto" id="container_auto">
-    <div class="content" id="content_auto">auto</div>
-  </div>
-
-  <div class="container themed" id="container_themed">
-    <div class="content" id="content_themed">themed</div>
-  </div>
-
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.html
new file mode 100644
index 0000000000..cff00c634f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.html
@@ -0,0 +1,60 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-color on body correctly interacts with ::-webkit-scrollbar</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .container {
+    overflow: auto;
+    height: 200px;
+    width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  body {
+    scrollbar-color: yellow blue;
+  }
+
+  ::-webkit-scrollbar {
+    display: none;
+  }
+</style>
+<script>
+  function performTest() {
+    setup({ explicit_done: true });
+
+    test(function () {
+      let container = document.getElementById('container_themed');
+      let content = document.getElementById('content_themed');
+      assert_less_than(container.scrollWidth, container.offsetWidth, "themed scrollWidth");
+      assert_less_than(container.clientWidth, container.offsetWidth, "themed clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "themed offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "themed clientWidth");
+      assert_not_equals(container.offsetWidth, content.offsetWidth, "themed offsetWidth");
+    }, "scrollbar-color yellow blue on body overrides ::-webkit-scrollbar");
+
+    done();
+  }
+</script>
+
+<body onload="performTest()">
+
+  Test scrollbar-color: vertical scrollbar
+
+  <div class="container themed" id="container_themed">
+    <div class="content" id="content_themed">themed</div>
+  </div>
+
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.tentative.html
deleted file mode 100644
index 5932cc5d4e..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-004.tentative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-color on body correctly interacts with ::-webkit-scrollbar</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  .container {
-    overflow: auto;
-    height: 200px;
-    width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-  }
-
-  .content {
-    height: 300px;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  body {
-    scrollbar-color: yellow blue;
-  }
-
-  ::-webkit-scrollbar {
-    display: none;
-  }
-</style>
-<script>
-  function performTest() {
-    setup({ explicit_done: true });
-
-    test(function () {
-      let container = document.getElementById('container_themed');
-      let content = document.getElementById('content_themed');
-      assert_less_than(container.scrollWidth, container.offsetWidth, "themed scrollWidth");
-      assert_less_than(container.clientWidth, container.offsetWidth, "themed clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "themed offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "themed clientWidth");
-      assert_not_equals(container.offsetWidth, content.offsetWidth, "themed offsetWidth");
-    }, "scrollbar-color yellow blue on body overrides ::-webkit-scrollbar");
-
-    done();
-  }
-</script>
-
-<body onload="performTest()">
-
-  Test scrollbar-color: vertical scrollbar
-
-  <div class="container themed" id="container_themed">
-    <div class="content" id="content_themed">themed</div>
-  </div>
-
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.html
new file mode 100644
index 0000000000..d8ddc43c1c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.html
@@ -0,0 +1,60 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-color on body correctly interacts with ::-webkit-scrollbar on scrollable area</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .container {
+    overflow: auto;
+    height: 200px;
+    width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  body {
+    scrollbar-color: yellow blue;
+  }
+
+  .container::-webkit-scrollbar {
+    display: none;
+  }
+</style>
+<script>
+  function performTest() {
+    setup({ explicit_done: true });
+
+    test(function () {
+      let container = document.getElementById('container_themed');
+      let content = document.getElementById('content_themed');
+      assert_less_than(container.scrollWidth, container.offsetWidth, "themed scrollWidth");
+      assert_less_than(container.clientWidth, container.offsetWidth, "themed clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "themed offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "themed clientWidth");
+      assert_not_equals(container.offsetWidth, content.offsetWidth, "themed offsetWidth");
+    }, "scrollbar-color yellow blue on body overrides ::-webkit-scrollbar on scrollable area");
+
+    done();
+  }
+</script>
+
+<body onload="performTest()">
+
+  Test scrollbar-color: vertical scrollbar
+
+  <div class="container themed" id="container_themed">
+    <div class="content" id="content_themed">themed</div>
+  </div>
+
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.tentative.html
deleted file mode 100644
index 52d0027fba..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-005.tentative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-color on body correctly interacts with ::-webkit-scrollbar on scrollable area</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  .container {
-    overflow: auto;
-    height: 200px;
-    width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-  }
-
-  .content {
-    height: 300px;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  body {
-    scrollbar-color: yellow blue;
-  }
-
-  .container::-webkit-scrollbar {
-    display: none;
-  }
-</style>
-<script>
-  function performTest() {
-    setup({ explicit_done: true });
-
-    test(function () {
-      let container = document.getElementById('container_themed');
-      let content = document.getElementById('content_themed');
-      assert_less_than(container.scrollWidth, container.offsetWidth, "themed scrollWidth");
-      assert_less_than(container.clientWidth, container.offsetWidth, "themed clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "themed offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "themed clientWidth");
-      assert_not_equals(container.offsetWidth, content.offsetWidth, "themed offsetWidth");
-    }, "scrollbar-color yellow blue on body overrides ::-webkit-scrollbar on scrollable area");
-
-    done();
-  }
-</script>
-
-<body onload="performTest()">
-
-  Test scrollbar-color: vertical scrollbar
-
-  <div class="container themed" id="container_themed">
-    <div class="content" id="content_themed">themed</div>
-  </div>
-
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.html
new file mode 100644
index 0000000000..55947c984c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+<title>CSS Scrollbars: scrollbar-color on scrollable areas correctly interacts with ::-webkit-scrollbar-corner</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="match" href="scrollbar-color-006-ref.html" />
+<link rel="mismatch" href="scrollbar-color-006-mis-ref.html" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<style>
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+    scrollbar-color: yellow blue;
+  }
+
+  ::-webkit-scrollbar-corner {
+    background-color: purple;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div id="one" class="container">
+  <div class="content"></div>
+</div>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.tentative.html
deleted file mode 100644
index 11f0de750b..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-006.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html>
-<title>CSS Scrollbars: scrollbar-color on scrollable areas correctly interacts with ::-webkit-scrollbar-corner</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="match" href="scrollbar-color-006-ref.html" />
-<link rel="mismatch" href="scrollbar-color-006-mis-ref.html" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<style>
-  .container {
-    scrollbar-gutter: stable;
-    overflow: auto;
-    height: 200px;
-    min-width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-    scrollbar-color: yellow blue;
-  }
-
-  ::-webkit-scrollbar-corner {
-    background-color: purple;
-  }
-
-  .content {
-    height: 300px;
-    width: 300px;
-    background: red;
-  }
-</style>
-<div id="one" class="container">
-  <div class="content"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.html
new file mode 100644
index 0000000000..0ef07089de
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+<title>CSS Scrollbars: scrollbar-color on scrollable areas correctly interacts with ::-webkit-scrollbar-corner on container</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="match" href="scrollbar-color-007-ref.html" />
+<link rel="mismatch" href="scrollbar-color-007-mis-ref.html" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<style>
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+    scrollbar-color: yellow blue;
+  }
+
+  .container::-webkit-scrollbar-corner {
+    background-color: purple;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div id="one" class="container">
+  <div class="content"></div>
+</div>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.tentative.html
deleted file mode 100644
index 75358fdf68..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-007.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html>
-<title>CSS Scrollbars: scrollbar-color on scrollable areas correctly interacts with ::-webkit-scrollbar-corner on container</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="match" href="scrollbar-color-007-ref.html" />
-<link rel="mismatch" href="scrollbar-color-007-mis-ref.html" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<style>
-  .container {
-    scrollbar-gutter: stable;
-    overflow: auto;
-    height: 200px;
-    min-width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-    scrollbar-color: yellow blue;
-  }
-
-  .container::-webkit-scrollbar-corner {
-    background-color: purple;
-  }
-
-  .content {
-    height: 300px;
-    width: 300px;
-    background: red;
-  }
-</style>
-<div id="one" class="container">
-  <div class="content"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.html
new file mode 100644
index 0000000000..01e3848603
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html>
+<title>CSS Scrollbars: scrollbar-color on body correctly interacts with ::-webkit-scrollbar-corner on container</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="match" href="scrollbar-color-008-ref.html" />
+<link rel="mismatch" href="scrollbar-color-008-mis-ref.html" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<style>
+  body {
+    scrollbar-color: yellow blue;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .container::-webkit-scrollbar-corner {
+    background-color: purple;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div id="one" class="container">
+  <div class="content"></div>
+</div>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.tentative.html
deleted file mode 100644
index 576193814c..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-008.tentative.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<html>
-<title>CSS Scrollbars: scrollbar-color on body correctly interacts with ::-webkit-scrollbar-corner on container</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="match" href="scrollbar-color-008-ref.html" />
-<link rel="mismatch" href="scrollbar-color-008-mis-ref.html" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<style>
-  body {
-    scrollbar-color: yellow blue;
-  }
-
-  .container {
-    scrollbar-gutter: stable;
-    overflow: auto;
-    height: 200px;
-    min-width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-  }
-
-  .container::-webkit-scrollbar-corner {
-    background-color: purple;
-  }
-
-  .content {
-    height: 300px;
-    width: 300px;
-    background: red;
-  }
-</style>
-<div id="one" class="container">
-  <div class="content"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.html
new file mode 100644
index 0000000000..6b17c19c15
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+<title>CSS Scrollbars: scrollbar-color on root correctly interacts with ::-webkit-scrollbar-corner</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="match" href="scrollbar-color-009-ref.html" />
+<link rel="mismatch" href="scrollbar-color-009-mis-ref.html" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<style>
+  :root {
+    scrollbar-color: yellow blue;
+  }
+
+  body {
+    overflow: scroll;
+  }
+
+  ::-webkit-scrollbar-corner {
+    background-color: purple;
+  }
+</style>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.tentative.html
deleted file mode 100644
index 312bbc731b..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-009.tentative.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-<title>CSS Scrollbars: scrollbar-color on root correctly interacts with ::-webkit-scrollbar-corner</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="match" href="scrollbar-color-009-ref.html" />
-<link rel="mismatch" href="scrollbar-color-009-mis-ref.html" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<style>
-  :root {
-    scrollbar-color: yellow blue;
-  }
-
-  body {
-    overflow: scroll;
-  }
-
-  ::-webkit-scrollbar-corner {
-    background-color: purple;
-  }
-</style>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.html
new file mode 100644
index 0000000000..cc78504ba7
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+<title>CSS Scrollbars: scrollbar-color on root correctly interacts with ::-webkit-scrollbar-corner on body</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="match" href="scrollbar-color-010-ref.html" />
+<link rel="mismatch" href="scrollbar-color-010-mis-ref.html" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<style>
+  :root {
+    scrollbar-color: yellow blue;
+  }
+
+  body {
+    overflow: scroll;
+  }
+
+  body::-webkit-scrollbar-corner {
+    background-color: purple;
+  }
+</style>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.tentative.html
deleted file mode 100644
index 9f560613e0..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-010.tentative.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-<title>CSS Scrollbars: scrollbar-color on root correctly interacts with ::-webkit-scrollbar-corner on body</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="match" href="scrollbar-color-010-ref.html" />
-<link rel="mismatch" href="scrollbar-color-010-mis-ref.html" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<style>
-  :root {
-    scrollbar-color: yellow blue;
-  }
-
-  body {
-    overflow: scroll;
-  }
-
-  body::-webkit-scrollbar-corner {
-    background-color: purple;
-  }
-</style>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.html
new file mode 100644
index 0000000000..8f1cd13a2f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set scrollbar-colors when starts ::-webkit-scrollbar and ensure scrollbars update</title>
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#color-compat" />
+<link rel="match" href="scrollbar-color-dynamic-8-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root::-webkit-scrollbar {
+    background: pink;
+  }
+  :root::-webkit-scrollbar-thumb {
+    background: orange;
+  }
+
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+</style>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.documentElement.style.scrollbarColor = 'blue green';
+
+    takeScreenshot();
+  }));
+</script>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.tentative.html
deleted file mode 100644
index 4926fadaca..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-color-dynamic-8.tentative.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<html class="reftest-wait">
-<title>Dynamically set scrollbar-colors when starts ::-webkit-scrollbar and ensure scrollbars update</title>
-<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars" />
-<link rel="match" href="scrollbar-color-dynamic-8-ref.html" />
-<script src="/common/reftest-wait.js"></script>
-<style>
-  :root::-webkit-scrollbar {
-    background: pink;
-  }
-  :root::-webkit-scrollbar-thumb {
-    background: orange;
-  }
-
-  body {
-    display: flex;
-    flex-wrap: wrap;
-    width: 200vw;
-    height: 200vh;
-  }
-</style>
-<script>
-  requestAnimationFrame(() => requestAnimationFrame(() => {
-    document.documentElement.style.scrollbarColor = 'blue green';
-
-    takeScreenshot();
-  }));
-</script>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.html
new file mode 100644
index 0000000000..3c28dff498
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-width auto on the root defers to ::-webkit-scrollbar on the root</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#width-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  :root {
+    scrollbar-width: auto;
+  }
+
+  :root::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
+  @supports not selector(::-webkit-scrollbar) {
+    :root {
+      overflow: hidden;
+    }
+  }
+
+  :root,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  #content {
+    height: 10vh;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  #expander {
+    /* force vertical scroll */
+    height: 200vh;
+    width: 300px;
+    background: gray;
+  }
+</style>
+
+<body>
+
+  <div id="content"></div>
+
+  <div id="expander"></div>
+
+  <script>
+    test(function () {
+      let root = document.documentElement;
+      let body = document.body;
+      let content = document.getElementById('content');
+
+      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
+      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
+      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
+    }, "scrollbar-width auto on the root defers to ::-webkit-scrollbar");
+  </script>
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.tentative.html
deleted file mode 100644
index ea11703067..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-010.tentative.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-width auto on the root defers to ::-webkit-scrollbar on the root</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  :root {
-    scrollbar-width: auto;
-  }
-
-  :root::-webkit-scrollbar {
-    display: none;
-  }
-
-  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
-  @supports not selector(::-webkit-scrollbar) {
-    :root {
-      overflow: hidden;
-    }
-  }
-
-  :root,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-
-  #content {
-    height: 10vh;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  #expander {
-    /* force vertical scroll */
-    height: 200vh;
-    width: 300px;
-    background: gray;
-  }
-</style>
-
-<body>
-
-  <div id="content"></div>
-
-  <div id="expander"></div>
-
-  <script>
-    test(function () {
-      let root = document.documentElement;
-      let body = document.body;
-      let content = document.getElementById('content');
-
-      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
-      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
-      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
-    }, "scrollbar-width auto on the root defers to ::-webkit-scrollbar");
-  </script>
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.html
new file mode 100644
index 0000000000..e9c22c83a9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.html
@@ -0,0 +1,55 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-width thin on the root overrides ::-webkit-scrollbar on the root</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#width-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  :root {
+    scrollbar-width: thin;
+  }
+
+  :root::-webkit-scrollbar {
+    display: none;
+  }
+
+  :root,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  #content {
+    height: 10vh;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  #expander {
+    /* force vertical scroll */
+    height: 200vh;
+    width: 300px;
+    background: gray;
+  }
+</style>
+
+<body>
+
+  <div id="content"></div>
+
+  <div id="expander"></div>
+
+  <script>
+    test(function () {
+      let root = document.documentElement;
+      let body = document.body;
+      let content = document.getElementById('content');
+
+      assert_less_than(root.offsetWidth, window.innerWidth, "viewport has a scrollbar");
+      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
+      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
+    }, "scrollbar-width thin on the root overrides ::-webkit-scrollbar");
+  </script>
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.tentative.html
deleted file mode 100644
index a5f60dc28b..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-011.tentative.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-width thin on the root overrides ::-webkit-scrollbar on the root</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  :root {
-    scrollbar-width: thin;
-  }
-
-  :root::-webkit-scrollbar {
-    display: none;
-  }
-
-  :root,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-
-  #content {
-    height: 10vh;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  #expander {
-    /* force vertical scroll */
-    height: 200vh;
-    width: 300px;
-    background: gray;
-  }
-</style>
-
-<body>
-
-  <div id="content"></div>
-
-  <div id="expander"></div>
-
-  <script>
-    test(function () {
-      let root = document.documentElement;
-      let body = document.body;
-      let content = document.getElementById('content');
-
-      assert_less_than(root.offsetWidth, window.innerWidth, "viewport has a scrollbar");
-      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
-      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
-    }, "scrollbar-width thin on the root overrides ::-webkit-scrollbar");
-  </script>
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.html
new file mode 100644
index 0000000000..eefd5538b8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-width none on the root overrides ::-webkit-scrollbar on the root</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#width-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  :root {
+    scrollbar-width: none;
+  }
+
+  :root::-webkit-scrollbar {
+    width: 20px;
+    background-color: lightgray;
+  }
+
+  :root,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  #content {
+    height: 10vh;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  #expander {
+    /* force vertical scroll */
+    height: 200vh;
+    width: 300px;
+    background: gray;
+  }
+</style>
+
+<body>
+
+  <div id="content"></div>
+
+  <div id="expander"></div>
+
+  <script>
+    test(function () {
+      let root = document.documentElement;
+      let body = document.body;
+      let content = document.getElementById('content');
+
+      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
+      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
+      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
+    }, "scrollbar-width none on the root overrides ::-webkit-scrollbar");
+  </script>
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.tentative.html
deleted file mode 100644
index a685d6c05b..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-012.tentative.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-width none on the root overrides ::-webkit-scrollbar on the root</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  :root {
-    scrollbar-width: none;
-  }
-
-  :root::-webkit-scrollbar {
-    width: 20px;
-    background-color: lightgray;
-  }
-
-  :root,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-
-  #content {
-    height: 10vh;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  #expander {
-    /* force vertical scroll */
-    height: 200vh;
-    width: 300px;
-    background: gray;
-  }
-</style>
-
-<body>
-
-  <div id="content"></div>
-
-  <div id="expander"></div>
-
-  <script>
-    test(function () {
-      let root = document.documentElement;
-      let body = document.body;
-      let content = document.getElementById('content');
-
-      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
-      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
-      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
-    }, "scrollbar-width none on the root overrides ::-webkit-scrollbar");
-  </script>
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.html
new file mode 100644
index 0000000000..4a8a9182e5
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.html
@@ -0,0 +1,55 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-width thin on the root overridess ::-webkit-scrollbar</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#width-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  :root {
+    scrollbar-width: thin;
+  }
+
+  ::-webkit-scrollbar {
+    display: none;
+  }
+
+  :root,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  #content {
+    height: 10vh;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  #expander {
+    /* force vertical scroll */
+    height: 200vh;
+    width: 300px;
+    background: gray;
+  }
+</style>
+
+<body>
+
+  <div id="content"></div>
+
+  <div id="expander"></div>
+
+  <script>
+    test(function () {
+      let root = document.documentElement;
+      let body = document.body;
+      let content = document.getElementById('content');
+
+      assert_less_than(root.offsetWidth, window.innerWidth, "viewport has a scrollbar");
+      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
+      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
+    }, "scrollbar-width thin on the root overridess ::-webkit-scrollbar");
+  </script>
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.tentative.html
deleted file mode 100644
index f6460a4797..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-013.tentative.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-width thin on the root overridess ::-webkit-scrollbar</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  :root {
-    scrollbar-width: thin;
-  }
-
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  :root,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-
-  #content {
-    height: 10vh;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  #expander {
-    /* force vertical scroll */
-    height: 200vh;
-    width: 300px;
-    background: gray;
-  }
-</style>
-
-<body>
-
-  <div id="content"></div>
-
-  <div id="expander"></div>
-
-  <script>
-    test(function () {
-      let root = document.documentElement;
-      let body = document.body;
-      let content = document.getElementById('content');
-
-      assert_less_than(root.offsetWidth, window.innerWidth, "viewport has a scrollbar");
-      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
-      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
-    }, "scrollbar-width thin on the root overridess ::-webkit-scrollbar");
-  </script>
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.html
new file mode 100644
index 0000000000..b8ca3cbb94
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-width thin on the body doesn't override ::-webkit-scrollbar on root</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#width-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  body {
+    scrollbar-width: thin;
+  }
+
+  :root::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
+  @supports not selector(::-webkit-scrollbar) {
+    :root {
+      overflow: hidden;
+    }
+  }
+
+  :root,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  #content {
+    height: 10vh;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  #expander {
+    /* force vertical scroll */
+    height: 200vh;
+    width: 300px;
+    background: gray;
+  }
+</style>
+
+<body>
+
+  <div id="content"></div>
+
+  <div id="expander"></div>
+
+  <script>
+    test(function () {
+      let root = document.documentElement;
+      let body = document.body;
+      let content = document.getElementById('content');
+
+      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
+      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
+      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
+    }, "scrollbar-width thin on the body doesn't override ::-webkit-scrollbar on root");
+  </script>
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.tentative.html
deleted file mode 100644
index b3702015d5..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-014.tentative.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-width thin on the body doesn't override ::-webkit-scrollbar on root</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  body {
-    scrollbar-width: thin;
-  }
-
-  :root::-webkit-scrollbar {
-    display: none;
-  }
-
-  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
-  @supports not selector(::-webkit-scrollbar) {
-    :root {
-      overflow: hidden;
-    }
-  }
-
-  :root,
-  body {
-    margin: 0;
-    padding: 0;
-  }
-
-  #content {
-    height: 10vh;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  #expander {
-    /* force vertical scroll */
-    height: 200vh;
-    width: 300px;
-    background: gray;
-  }
-</style>
-
-<body>
-
-  <div id="content"></div>
-
-  <div id="expander"></div>
-
-  <script>
-    test(function () {
-      let root = document.documentElement;
-      let body = document.body;
-      let content = document.getElementById('content');
-
-      assert_equals(root.offsetWidth, window.innerWidth, "viewport does not show a scrollbar");
-      assert_equals(body.offsetWidth, root.offsetWidth, "body matches root");
-      assert_equals(content.offsetWidth, body.offsetWidth, "content matches body");
-    }, "scrollbar-width thin on the body doesn't override ::-webkit-scrollbar on root");
-  </script>
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.html
new file mode 100644
index 0000000000..7fc1ae120a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.html
@@ -0,0 +1,87 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-width on scrollable areas correctly interacts with ::-webkit-scrollbar</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#width-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .container {
+    overflow: auto;
+    height: 200px;
+    width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  .container.auto {
+    scrollbar-width: auto;
+  }
+
+  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
+  @supports not selector(::-webkit-scrollbar) {
+    .container.auto {
+      overflow: hidden;
+    }
+  }
+
+  ::-webkit-scrollbar {
+    display: none;
+  }
+
+  .container.thin {
+    scrollbar-width: thin;
+  }
+</style>
+<script>
+  function performTest() {
+    setup({ explicit_done: true });
+
+    // ltr
+
+    test(function () {
+      let container = document.getElementById('container_auto');
+      let content = document.getElementById('content_auto');
+      assert_equals(container.scrollWidth, 200, "auto scrollWidth");
+      assert_equals(container.clientWidth, 200, "auto clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "auto offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "auto clientWidth");
+      assert_equals(container.offsetWidth, content.offsetWidth, "auto offsetWidth");
+    }, "scrollbar-width auto defers to ::-webkit-scrollbar");
+
+    test(function () {
+      let container = document.getElementById('container_thin');
+      let content = document.getElementById('content_thin');
+      assert_less_than(container.scrollWidth, container.offsetWidth, "thin scrollWidth");
+      assert_less_than(container.clientWidth, container.offsetWidth, "thin clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "thin offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "thin clientWidth");
+      assert_not_equals(container.offsetWidth, content.offsetWidth, "thin offsetWidth");
+    }, "scrollbar-width thin overrides ::-webkit-scrollbar");
+
+    done();
+  }
+</script>
+
+<body onload="performTest()">
+
+  Test scrollbar-width: vertical scrollbar
+
+  <div class="container auto" id="container_auto">
+    <div class="content" id="content_auto">auto</div>
+  </div>
+
+  <div class="container thin" id="container_thin">
+    <div class="content" id="content_thin">thin</div>
+  </div>
+
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.tentative.html
deleted file mode 100644
index 88a6af27ba..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-015.tentative.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-width on scrollable areas correctly interacts with ::-webkit-scrollbar</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  .container {
-    overflow: auto;
-    height: 200px;
-    width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-  }
-
-  .content {
-    height: 300px;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  .container.auto {
-    scrollbar-width: auto;
-  }
-
-  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
-  @supports not selector(::-webkit-scrollbar) {
-    .container.auto {
-      overflow: hidden;
-    }
-  }
-
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  .container.thin {
-    scrollbar-width: thin;
-  }
-</style>
-<script>
-  function performTest() {
-    setup({ explicit_done: true });
-
-    // ltr
-
-    test(function () {
-      let container = document.getElementById('container_auto');
-      let content = document.getElementById('content_auto');
-      assert_equals(container.scrollWidth, 200, "auto scrollWidth");
-      assert_equals(container.clientWidth, 200, "auto clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "auto offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "auto clientWidth");
-      assert_equals(container.offsetWidth, content.offsetWidth, "auto offsetWidth");
-    }, "scrollbar-width auto defers to ::-webkit-scrollbar");
-
-    test(function () {
-      let container = document.getElementById('container_thin');
-      let content = document.getElementById('content_thin');
-      assert_less_than(container.scrollWidth, container.offsetWidth, "thin scrollWidth");
-      assert_less_than(container.clientWidth, container.offsetWidth, "thin clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "thin offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "thin clientWidth");
-      assert_not_equals(container.offsetWidth, content.offsetWidth, "thin offsetWidth");
-    }, "scrollbar-width thin overrides ::-webkit-scrollbar");
-
-    done();
-  }
-</script>
-
-<body onload="performTest()">
-
-  Test scrollbar-width: vertical scrollbar
-
-  <div class="container auto" id="container_auto">
-    <div class="content" id="content_auto">auto</div>
-  </div>
-
-  <div class="container thin" id="container_thin">
-    <div class="content" id="content_thin">thin</div>
-  </div>
-
-</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.html
new file mode 100644
index 0000000000..29b4e47628
--- /dev/null
+++ b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.html
@@ -0,0 +1,114 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Scrollbars: scrollbar-width on scrollable areas correctly interacts with ::-webkit-scrollbar on container</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/#width-compat" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  .container {
+    overflow: auto;
+    height: 200px;
+    width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 100%;
+    background: lightsalmon;
+  }
+
+  .container.auto {
+    scrollbar-width: auto;
+  }
+
+  .container.auto::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
+  @supports not selector(::-webkit-scrollbar) {
+    .container.auto {
+      overflow: hidden;
+    }
+  }
+
+  .container.thin {
+    scrollbar-width: thin;
+  }
+
+  .container.thin::-webkit-scrollbar {
+    display: none;
+  }
+
+  .container.none {
+    scrollbar-width: none;
+  }
+
+  .container.none::-webkit-scrollbar {
+    width: 20px;
+    background-color: lightgray;
+  }
+</style>
+<script>
+  function performTest() {
+    setup({ explicit_done: true });
+
+    // ltr
+
+    test(function () {
+      let container = document.getElementById('container_auto');
+      let content = document.getElementById('content_auto');
+      assert_equals(container.scrollWidth, 200, "auto scrollWidth");
+      assert_equals(container.clientWidth, 200, "auto clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "auto offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "auto clientWidth");
+      assert_equals(container.offsetWidth, content.offsetWidth, "auto offsetWidth");
+    }, "scrollbar-width auto defers to ::-webkit-scrollbar");
+
+    test(function () {
+      let container = document.getElementById('container_thin');
+      let content = document.getElementById('content_thin');
+      assert_less_than(container.scrollWidth, container.offsetWidth, "thin scrollWidth");
+      assert_less_than(container.clientWidth, container.offsetWidth, "thin clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "thin offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "thin clientWidth");
+      assert_not_equals(container.offsetWidth, content.offsetWidth, "thin offsetWidth");
+    }, "scrollbar-width thin overrides ::-webkit-scrollbar");
+
+    test(function () {
+      let container = document.getElementById('container_none');
+      let content = document.getElementById('content_none');
+      assert_equals(container.scrollWidth, 200, "none scrollWidth");
+      assert_equals(container.clientWidth, 200, "none clientWidth");
+      assert_equals(container.offsetLeft, content.offsetLeft, "none offsetLeft");
+      assert_equals(container.clientWidth, content.clientWidth, "none clientWidth");
+      assert_equals(container.offsetWidth, content.offsetWidth, "none offsetWidth");
+    }, "scrollbar-width none overrides ::-webkit-scrollbar");
+
+    done();
+  }
+</script>
+
+<body onload="performTest()">
+
+  Test scrollbar-width: vertical scrollbar
+
+  <div class="container auto" id="container_auto">
+    <div class="content" id="content_auto">auto</div>
+  </div>
+
+  <div class="container thin" id="container_thin">
+    <div class="content" id="content_thin">thin</div>
+  </div>
+
+  <div class="container none" id="container_none">
+    <div class="content" id="content_none">none</div>
+  </div>
+
+</body>
diff --git a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.tentative.html b/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.tentative.html
deleted file mode 100644
index 7d64131743..0000000000
--- a/testing/web-platform/tests/css/css-scrollbars/scrollbar-width-016.tentative.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>CSS Scrollbars: scrollbar-width on scrollable areas correctly interacts with ::-webkit-scrollbar on container</title>
-<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
-<link rel="help" href="https://drafts.csswg.org/css-scrollbars-1/" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<style>
-  .container {
-    overflow: auto;
-    height: 200px;
-    width: 200px;
-    margin: 1px;
-    padding: 0px;
-    border: none;
-    background: deepskyblue;
-  }
-
-  .content {
-    height: 300px;
-    width: 100%;
-    background: lightsalmon;
-  }
-
-  .container.auto {
-    scrollbar-width: auto;
-  }
-
-  .container.auto::-webkit-scrollbar {
-    display: none;
-  }
-
-  /* This is so that browsers that don't implement the WebKit prefix still pass the test */
-  @supports not selector(::-webkit-scrollbar) {
-    .container.auto {
-      overflow: hidden;
-    }
-  }
-
-  .container.thin {
-    scrollbar-width: thin;
-  }
-
-  .container.thin::-webkit-scrollbar {
-    display: none;
-  }
-
-  .container.none {
-    scrollbar-width: none;
-  }
-
-  .container.none::-webkit-scrollbar {
-    width: 20px;
-    background-color: lightgray;
-  }
-</style>
-<script>
-  function performTest() {
-    setup({ explicit_done: true });
-
-    // ltr
-
-    test(function () {
-      let container = document.getElementById('container_auto');
-      let content = document.getElementById('content_auto');
-      assert_equals(container.scrollWidth, 200, "auto scrollWidth");
-      assert_equals(container.clientWidth, 200, "auto clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "auto offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "auto clientWidth");
-      assert_equals(container.offsetWidth, content.offsetWidth, "auto offsetWidth");
-    }, "scrollbar-width auto defers to ::-webkit-scrollbar");
-
-    test(function () {
-      let container = document.getElementById('container_thin');
-      let content = document.getElementById('content_thin');
-      assert_less_than(container.scrollWidth, container.offsetWidth, "thin scrollWidth");
-      assert_less_than(container.clientWidth, container.offsetWidth, "thin clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "thin offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "thin clientWidth");
-      assert_not_equals(container.offsetWidth, content.offsetWidth, "thin offsetWidth");
-    }, "scrollbar-width thin overrides ::-webkit-scrollbar");
-
-    test(function () {
-      let container = document.getElementById('container_none');
-      let content = document.getElementById('content_none');
-      assert_equals(container.scrollWidth, 200, "none scrollWidth");
-      assert_equals(container.clientWidth, 200, "none clientWidth");
-      assert_equals(container.offsetLeft, content.offsetLeft, "none offsetLeft");
-      assert_equals(container.clientWidth, content.clientWidth, "none clientWidth");
-      assert_equals(container.offsetWidth, content.offsetWidth, "none offsetWidth");
-    }, "scrollbar-width none overrides ::-webkit-scrollbar");
-
-    done();
-  }
-</script>
-
-<body onload="performTest()">
-
-  Test scrollbar-width: vertical scrollbar
-
-  <div class="container auto" id="container_auto">
-    <div class="content" id="content_auto">auto</div>
-  </div>
-
-  <div class="container thin" id="container_thin">
-    <div class="content" id="content_thin">thin</div>
-  </div>
-
-  <div class="container none" id="container_none">
-    <div class="content" id="content_none">none</div>
-  </div>
-
-</body>
-- 
cgit v1.2.3