Bug 1461046 Part 6: Remove submitted WPT reftests that checked for empty float areas (which are no longer empty), or relied on ignoring horizontal spurs in polygons. r=dholbert
☠☠ backed out by 8c9263730393 ☠ ☠
authorBrad Werth <bwerth@mozilla.com>
Fri, 25 May 2018 10:44:40 -0700
changeset 420752 8e0c340b97008f245b23c273240c3876fd64a5eb
parent 420751 fbfe1d5b94e18aa6cd09e684c46ea9895c6c43c3
child 420753 f5990eb1eb0d2f89f082783a377785e95b40d541
push id34078
push usercsabou@mozilla.com
push dateFri, 01 Jun 2018 09:40:19 +0000
treeherdermozilla-central@50c379fc5536 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1461046
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1461046 Part 6: Remove submitted WPT reftests that checked for empty float areas (which are no longer empty), or relied on ignoring horizontal spurs in polygons. r=dholbert MozReview-Commit-ID: 4fADKtvcZVp
layout/reftests/w3c-css/submitted/shapes1/reftest.list
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-040.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-046.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-026-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-026.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-027-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-027.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-028.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-029.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-030-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-030.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-031-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-031.html
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-040.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-046.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-028.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-029.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031.html
--- a/layout/reftests/w3c-css/submitted/shapes1/reftest.list
+++ b/layout/reftests/w3c-css/submitted/shapes1/reftest.list
@@ -39,24 +39,20 @@ fails == shape-outside-border-box-border
 # Basic shape: circle()
 == shape-outside-circle-032.html shape-outside-circle-032-ref.html
 fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),7,6) == shape-outside-circle-033.html shape-outside-circle-033-ref.html
 == shape-outside-circle-034.html shape-outside-circle-034-ref.html
 == shape-outside-circle-035.html shape-outside-circle-035-ref.html
 == shape-outside-circle-036.html shape-outside-circle-036-ref.html
 == shape-outside-circle-037.html shape-outside-circle-036-ref.html
 == shape-outside-circle-038.html shape-outside-circle-036-ref.html
-== shape-outside-circle-039.html shape-outside-circle-039-ref.html
-== shape-outside-circle-040.html shape-outside-circle-039-ref.html
 == shape-outside-circle-041.html shape-outside-circle-041-ref.html
 == shape-outside-circle-042.html shape-outside-circle-042-ref.html
 == shape-outside-circle-043.html shape-outside-circle-042-ref.html
 == shape-outside-circle-044.html shape-outside-circle-042-ref.html
-== shape-outside-circle-045.html shape-outside-circle-045-ref.html
-== shape-outside-circle-046.html shape-outside-circle-045-ref.html
 == shape-outside-circle-047.html shape-outside-circle-047-ref.html
 == shape-outside-circle-048.html shape-outside-circle-048-ref.html
 == shape-outside-circle-049.html shape-outside-circle-049-ref.html
 == shape-outside-circle-050.html shape-outside-circle-050-ref.html
 == shape-outside-circle-051.html shape-outside-circle-051-ref.html
 == shape-outside-circle-052.html shape-outside-circle-052-ref.html
 == shape-outside-circle-053.html shape-outside-circle-053-ref.html
 fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),16,4) == shape-outside-circle-054.html shape-outside-circle-054-ref.html
@@ -84,18 +80,16 @@ fuzzy(108,81) == shape-outside-circle-05
 == shape-outside-ellipse-049.html shape-outside-ellipse-049-ref.html
 == shape-outside-ellipse-050.html shape-outside-ellipse-050-ref.html
 == shape-outside-ellipse-051.html shape-outside-ellipse-051-ref.html
 fuzzy(108,81) == shape-outside-ellipse-052.html shape-outside-ellipse-052-ref.html
 
 # Basic shape: inset()
 == shape-outside-inset-016.html shape-outside-inset-016-ref.html
 == shape-outside-inset-017.html shape-outside-inset-017-ref.html
-== shape-outside-inset-018.html shape-outside-inset-018-ref.html
-== shape-outside-inset-019.html shape-outside-inset-019-ref.html
 == shape-outside-inset-020.html shape-outside-inset-020-ref.html
 == shape-outside-inset-021.html shape-outside-inset-021-ref.html
 == shape-outside-inset-022.html shape-outside-inset-022-ref.html
 == shape-outside-inset-023.html shape-outside-inset-023-ref.html
 == shape-outside-inset-024.html shape-outside-inset-024-ref.html
 == shape-outside-inset-025.html shape-outside-inset-025-ref.html
 == shape-outside-inset-026.html shape-outside-inset-026-ref.html
 == shape-outside-inset-027.html shape-outside-inset-027-ref.html
@@ -104,15 +98,9 @@ fuzzy(108,81) == shape-outside-ellipse-0
 == shape-outside-polygon-018.html shape-outside-polygon-018-ref.html
 == shape-outside-polygon-019.html shape-outside-polygon-019-ref.html
 == shape-outside-polygon-020.html shape-outside-polygon-020-ref.html
 == shape-outside-polygon-021.html shape-outside-polygon-021-ref.html
 == shape-outside-polygon-022.html shape-outside-polygon-022-ref.html
 == shape-outside-polygon-023.html shape-outside-polygon-023-ref.html
 == shape-outside-polygon-024.html shape-outside-polygon-024-ref.html
 == shape-outside-polygon-025.html shape-outside-polygon-025-ref.html
-== shape-outside-polygon-026.html shape-outside-polygon-026-ref.html
-== shape-outside-polygon-027.html shape-outside-polygon-027-ref.html
-== shape-outside-polygon-028.html shape-outside-polygon-026-ref.html
-== shape-outside-polygon-029.html shape-outside-polygon-027-ref.html
-== shape-outside-polygon-030.html shape-outside-polygon-030-ref.html
-== shape-outside-polygon-031.html shape-outside-polygon-031-ref.html
 fuzzy(101,2263) == shape-outside-polygon-032.html shape-outside-polygon-032-ref.html
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039-ref.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, circle(0%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 20px;
-    width: 20px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px; top: 0px; left: 0px;"></div>
-    <div class="box" style="height: 12px; top: 12px; left: 0px;"></div>
-    <div class="box" style="height: 36px; top: 24px; left: 0px;"></div>
-    <div class="box" style="height: 36px; top: 60px; left: 0px;"></div>
-    <div class="box" style="height: 12px; top: 96px; left: 0px;"></div>
-    <div class="box" style="height: 12px; top: 108px; left: 0px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, circle(0%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-039-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape circle(0%) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    shape-outside: circle(0%) border-box;
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-040.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, circle(closest-side at left center) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-039-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape circle(closest-side at left center) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    shape-outside: circle(closest-side at left center) border-box;
-    clip-path: circle(closest-side at left center) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045-ref.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, circle(0%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    direction: rtl;
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 20px;
-    width: 20px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px; top: 0px; right: 0px;"></div>
-    <div class="box" style="height: 12px; top: 12px; right: 0px;"></div>
-    <div class="box" style="height: 36px; top: 24px; right: 0px;"></div>
-    <div class="box" style="height: 36px; top: 60px; right: 0px;"></div>
-    <div class="box" style="height: 12px; top: 96px; right: 0px;"></div>
-    <div class="box" style="height: 12px; top: 108px; right: 0px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, circle(0%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-045-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape circle(0%) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    shape-outside: circle(0%) border-box;
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-046.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, circle(closest-side at right center) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-045-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape circle(closest-side at right center) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    shape-outside: circle(closest-side at right center) border-box;
-    clip-path: circle(closest-side at right center) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018-ref.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, inset(50%) reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px; top: 0; left: 0;"></div>
-    <div class="box" style="height: 36px; top: 24px; left: 0;"></div>
-    <div class="box" style="height: 36px; top: 60px; left: 0;"></div>
-    <div class="box" style="height: 24px; top: 96px; left: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, inset(50%)</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-018-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape inset(50%) value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    shape-outside: inset(50%);
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 24px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019-ref.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, inset(50%) reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    direction: rtl;
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px; top: 0; right: 0;"></div>
-    <div class="box" style="height: 36px; top: 24px; right: 0;"></div>
-    <div class="box" style="height: 36px; top: 60px; right: 0;"></div>
-    <div class="box" style="height: 24px; top: 96px; right: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, inset(50%)</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-019-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape inset(50%) value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    shape-outside: inset(50%);
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 24px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-026-ref.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(60px 20px, 100px 60px) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px; top: 0; left: 0;"></div>
-    <div class="long box" style="height: 30px; top: 30px; left: 0;"></div>
-    <div class="long box" style="height: 20px; top: 60px; left: 0;"></div>
-    <div class="long box" style="height: 20px; top: 80px; left: 0;"></div>
-    <div class="long box" style="height: 30px; top: 100px; left: 0;"></div>
-    <div class="long box" style="height: 30px; top: 130px; left: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-026.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(60px 20px, 100px 60px) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-026-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the polygon(60px 20px, 100px 60px) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Less than three vertices, resulting an empty area. */
-    shape-outside: polygon(60px 20px, 100px 60px) border-box;
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-027-ref.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(60px 20px, 100px 60px) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px; top: 0; right: 0;"></div>
-    <div class="long box" style="height: 30px; top: 30px; right: 0;"></div>
-    <div class="long box" style="height: 20px; top: 60px; right: 0;"></div>
-    <div class="long box" style="height: 20px; top: 80px; right: 0;"></div>
-    <div class="long box" style="height: 30px; top: 100px; right: 0;"></div>
-    <div class="long box" style="height: 30px; top: 130px; right: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-027.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(60px 20px, 100px 60px) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-027-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the polygon(60px 20px, 100px 60px) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Less than three vertices, resulting an empty area. */
-    shape-outside: polygon(60px 20px, 100px 60px) border-box;
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-028.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-026-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* All vertices are collinear, resulting an empty area. */
-    shape-outside: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    clip-path: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-029.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-027-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* All vertices are collinear, resulting an empty area. */
-    shape-outside: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    clip-path: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-030-ref.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px; top: 0; left: 80px;"></div>
-    <div class="box" style="height: 30px; top: 30px; left: 80px;"></div>
-    <div class="box" style="height: 20px; top: 60px; left: 80px;"></div>
-    <div class="box" style="height: 20px; top: 80px; left: 80px;"></div>
-    <div class="box" style="height: 30px; top: 100px; left: 80px;"></div>
-    <div class="box" style="height: 30px; top: 130px; left: 80px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-030.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-030-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* polygon contains horizontal lines. */
-    shape-outside: polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box;
-    clip-path: polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-031-ref.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    direction: rtl;
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px; top: 0; right: 80px;"></div>
-    <div class="box" style="height: 30px; top: 30px; right: 80px;"></div>
-    <div class="box" style="height: 20px; top: 60px; right: 80px;"></div>
-    <div class="box" style="height: 20px; top: 80px; right: 80px;"></div>
-    <div class="box" style="height: 30px; top: 100px; right: 80px;"></div>
-    <div class="box" style="height: 30px; top: 130px; right: 80px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-031.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-031-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* polygon contains horizontal lines. */
-    shape-outside: polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box;
-    clip-path: polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-  </body>
-</html>
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -174980,40 +174980,16 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-040.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-040.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html",
        "=="
       ]
@@ -175052,40 +175028,16 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-046.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-046.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html",
        "=="
       ]
@@ -175496,40 +175448,16 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html",
        "=="
       ]
@@ -175880,88 +175808,16 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-028.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-028.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-029.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-029.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031.html": [
-    [
-     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031.html",
-     [
-      [
-       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01.html",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01-ref.html",
        "=="
       ]
@@ -272970,36 +272826,26 @@
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html": [
     [
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html": [
     [
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html": [
     [
      {}
@@ -273155,26 +273001,16 @@
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html": [
     [
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html": [
     [
      {}
@@ -273315,36 +273151,16 @@
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html": [
     [
      {}
     ]
    ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh": [
     [
      {}
@@ -519948,17 +519764,17 @@
    "2680b68f5c1720ce6d2b82d942ea21b0b1518587",
    "support"
   ],
   "css/css-scoping/shadow-assign-dynamic-001.html": [
    "c57e0fd5aa5be63e1cadf65a4e382798c5e05ec4",
    "reftest"
   ],
   "css/css-scoping/shadow-at-import.html": [
-   "40f2606177ad3143774d97060ac1bbfa9743801f",
+   "67295000ad3c24c2d9ab0ac556d34758f3ce654c",
    "reftest"
   ],
   "css/css-scoping/shadow-cascade-order-001.html": [
    "46913ea7e47811b11be898de5c3bd0a330ea6637",
    "testharness"
   ],
   "css/css-scoping/shadow-disabled-sheet-001.html": [
    "3de2d23c1b3339b964ec2c009832a3207a3b9dc4",
@@ -546044,17 +545860,17 @@
    "f131f271cb2f747e845584abcc445348e8c86521",
    "support"
   ],
   "css/cssom/StyleSheetList.html": [
    "0a1cd8ed56ac3a5b1a9556835d94fb80325199bf",
    "testharness"
   ],
   "css/cssom/at-namespace.html": [
-   "96da2dd244e9e19ff8ca1ca81b06c3ebdcee8267",
+   "cd3845557f5c40f51f7e3cbdfff52f440fe689b6",
    "testharness"
   ],
   "css/cssom/computed-style-001.html": [
    "0331a648e6b0d56f0e7365f1ff7d991ea77ce3e4",
    "testharness"
   ],
   "css/cssom/computed-style-002.html": [
    "d6579788bcfaf1d4c09324ba877a26ff95d6965d",
@@ -546176,29 +545992,29 @@
    "89c506ea58f2ad38eb9ecc1e5f422b81a45b07fa",
    "testharness"
   ],
   "css/cssom/inline-style-001.html": [
    "4c58b6153eabe796749dcaf181e03d7dce2c9c07",
    "testharness"
   ],
   "css/cssom/insertRule-charset-no-index.html": [
-   "cd3a96351a4c8dcd417fb03963f9d4fb0760c746",
+   "2be98274fe292089f381d216dc415ddc812a105f",
    "testharness"
   ],
   "css/cssom/insertRule-import-no-index.html": [
-   "ba89bad41a8d243f89ec91a0c02a34e97b378bc8",
+   "44ef5a2c490675d0088651dc101dbbb1fc83fdd1",
    "testharness"
   ],
   "css/cssom/insertRule-namespace-no-index.html": [
-   "109ed203fabac2da4279419deb34d5bc5a393d09",
+   "b9b63240c4a7bf52524b8e3dd36d6ca2ecb4bcdc",
    "testharness"
   ],
   "css/cssom/insertRule-no-index.html": [
-   "812f2b02d7694dd270b7a3e1ef205b99890ab216",
+   "825eb56d8e78bbdbd3bfb1861e6d40c245cd8f4b",
    "testharness"
   ],
   "css/cssom/insertRule-syntax-error-01.html": [
    "36f824b24dd56e20b7c524111512d8743745daaa",
    "testharness"
   ],
   "css/cssom/interfaces.html": [
    "42e325d3d7f6be7f557915072f61900ff611cef8",
@@ -554996,17 +554812,17 @@
    "77a40c794be3488c77edc9528d53755dfc7214b5",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/reftest.list": [
    "76c907a127aec740e17d009a517acccd5d3e9fd4",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list": [
-   "cf1af7daefe2db67dedf186e44744bbb03e537c3",
+   "c199bd6af0e3d2bbc8f87c3a768a1a8c4a17f7ab",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html": [
    "f60b429f37b066f9a16dceeb19bfa8ed4f2b0623",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html": [
    "633f57d18aa6315c4073ecfefb9d6ab2220e0fc1",
@@ -555159,28 +554975,16 @@
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html": [
    "87776a48f864360ed9857559aa0a4dce437c97ec",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html": [
    "61d2d2a07e2dcbd24a15b733f7c9d7dd3735ebd1",
    "reftest"
   ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039-ref.html": [
-   "80ba877ecdbb12e5f000dee707c5af2df4629a9b",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039.html": [
-   "0dad5434390d2500568fab4ca82d98147995f2a4",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-040.html": [
-   "7eaa3c8183209024684ff9a15f6b332802d91cb6",
-   "reftest"
-  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html": [
    "dcdc6fdf1ff9c749b6ed0dabc9029e641336832b",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html": [
    "ab31da83feb6a3176f4824c91b7bd4d9f299cb8d",
    "reftest"
   ],
@@ -555195,28 +554999,16 @@
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html": [
    "617a6ec0b2651145a4693c3e1d5a374004d5d7e7",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html": [
    "c669e12f7d26e25364eab72272e5964bb989cad3",
    "reftest"
   ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045-ref.html": [
-   "538d22bff3687524f756303205ad18dac9e182cf",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045.html": [
-   "8458a75aec990428264f039927377d683e4bfef9",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-046.html": [
-   "bfb735e59e22b55f8e3c42827ca8bcbe7a612774",
-   "reftest"
-  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html": [
    "4a138f3175f7d46a2a38643e9803ede5408db9cf",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html": [
    "05f11451254f6955d495e23005e03bba056ca2e0",
    "reftest"
   ],
@@ -555479,32 +555271,16 @@
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html": [
    "4b324c5f55d23968d2fd6ec9d6b417e8eda1c848",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html": [
    "628ef0b6c08230db7fca6639be71c63c0001156f",
    "reftest"
   ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018-ref.html": [
-   "e32f844e70a6f1b7c5c25fa691ba77321b557213",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018.html": [
-   "1d24d1acde6249154c8aecccf51c3f3d5bfc3f36",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019-ref.html": [
-   "7c0b699db61f02c5f197133c66439f699a80fd70",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019.html": [
-   "8ad1c65a27f12deb7b75865eb2b89905a4bbd4f0",
-   "reftest"
-  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html": [
    "8e109e72edb9cb0d3c97677db8a98462da83054f",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html": [
    "28a65a00f3010bc8b63ee81c4d293eb81e6daa08",
    "reftest"
   ],
@@ -555735,56 +555511,16 @@
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html": [
    "51cf20e605aa791e3d63c4902377aa3aca987ad7",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html": [
    "9393c2e2250dfc1bf3ffdd68f2c352890d1e0ee8",
    "reftest"
   ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026-ref.html": [
-   "322ec7ee1fb932cb6f1908c376be2915d6e50459",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026.html": [
-   "9fea24b92061f9f679b9565d9040e4b29a18b4c3",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027-ref.html": [
-   "e91e35a1af0a2fa21e31f8ea3fa903f6d862ad13",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027.html": [
-   "b27883660453186155c9b761402ae4c038f2394c",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-028.html": [
-   "6753ffe3a09c2a71fc67efcd1041ed90de12e87c",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-029.html": [
-   "de39a15da093018531838cac20c59494cb6050b2",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030-ref.html": [
-   "05d0d53f6d038702733e4acd9562e35b2b992881",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030.html": [
-   "0f653c07806f0064d1583a7ddaeb171734188062",
-   "reftest"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031-ref.html": [
-   "7bbccdb15fdf67a67bbc243c342c668fbef23af8",
-   "support"
-  ],
-  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031.html": [
-   "217e140bdd429d6889102e43253e6fb64dca4705",
-   "reftest"
-  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter": [
    "2c4512ec008c997d1254b5822ade227c057b7e24",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh": [
    "1c18dc5fdcddbbd08dbdc812f538a175e58892d7",
    "support"
   ],
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
@@ -38,24 +38,20 @@
 # Basic shape: circle()
 == shape-outside-circle-032.html shape-outside-circle-032-ref.html
 == shape-outside-circle-033.html shape-outside-circle-033-ref.html
 == shape-outside-circle-034.html shape-outside-circle-034-ref.html
 == shape-outside-circle-035.html shape-outside-circle-035-ref.html
 == shape-outside-circle-036.html shape-outside-circle-036-ref.html
 == shape-outside-circle-037.html shape-outside-circle-036-ref.html
 == shape-outside-circle-038.html shape-outside-circle-036-ref.html
-== shape-outside-circle-039.html shape-outside-circle-039-ref.html
-== shape-outside-circle-040.html shape-outside-circle-039-ref.html
 == shape-outside-circle-041.html shape-outside-circle-041-ref.html
 == shape-outside-circle-042.html shape-outside-circle-042-ref.html
 == shape-outside-circle-043.html shape-outside-circle-042-ref.html
 == shape-outside-circle-044.html shape-outside-circle-042-ref.html
-== shape-outside-circle-045.html shape-outside-circle-045-ref.html
-== shape-outside-circle-046.html shape-outside-circle-045-ref.html
 == shape-outside-circle-047.html shape-outside-circle-047-ref.html
 == shape-outside-circle-048.html shape-outside-circle-048-ref.html
 == shape-outside-circle-049.html shape-outside-circle-049-ref.html
 == shape-outside-circle-050.html shape-outside-circle-050-ref.html
 == shape-outside-circle-051.html shape-outside-circle-051-ref.html
 == shape-outside-circle-052.html shape-outside-circle-052-ref.html
 == shape-outside-circle-053.html shape-outside-circle-053-ref.html
 == shape-outside-circle-054.html shape-outside-circle-054-ref.html
@@ -81,18 +77,16 @@
 == shape-outside-ellipse-048.html shape-outside-ellipse-048-ref.html
 == shape-outside-ellipse-049.html shape-outside-ellipse-049-ref.html
 == shape-outside-ellipse-050.html shape-outside-ellipse-050-ref.html
 == shape-outside-ellipse-051.html shape-outside-ellipse-051-ref.html
 
 # Basic shape: inset()
 == shape-outside-inset-016.html shape-outside-inset-016-ref.html
 == shape-outside-inset-017.html shape-outside-inset-017-ref.html
-== shape-outside-inset-018.html shape-outside-inset-018-ref.html
-== shape-outside-inset-019.html shape-outside-inset-019-ref.html
 == shape-outside-inset-020.html shape-outside-inset-020-ref.html
 == shape-outside-inset-021.html shape-outside-inset-021-ref.html
 == shape-outside-inset-022.html shape-outside-inset-022-ref.html
 == shape-outside-inset-023.html shape-outside-inset-023-ref.html
 == shape-outside-inset-024.html shape-outside-inset-024-ref.html
 == shape-outside-inset-025.html shape-outside-inset-025-ref.html
 == shape-outside-inset-026.html shape-outside-inset-026-ref.html
 == shape-outside-inset-027.html shape-outside-inset-027-ref.html
@@ -101,14 +95,8 @@
 == shape-outside-polygon-018.html shape-outside-polygon-018-ref.html
 == shape-outside-polygon-019.html shape-outside-polygon-019-ref.html
 == shape-outside-polygon-020.html shape-outside-polygon-020-ref.html
 == shape-outside-polygon-021.html shape-outside-polygon-021-ref.html
 == shape-outside-polygon-022.html shape-outside-polygon-022-ref.html
 == shape-outside-polygon-023.html shape-outside-polygon-023-ref.html
 == shape-outside-polygon-024.html shape-outside-polygon-024-ref.html
 == shape-outside-polygon-025.html shape-outside-polygon-025-ref.html
-== shape-outside-polygon-026.html shape-outside-polygon-026-ref.html
-== shape-outside-polygon-027.html shape-outside-polygon-027-ref.html
-== shape-outside-polygon-028.html shape-outside-polygon-026-ref.html
-== shape-outside-polygon-029.html shape-outside-polygon-027-ref.html
-== shape-outside-polygon-030.html shape-outside-polygon-030-ref.html
-== shape-outside-polygon-031.html shape-outside-polygon-031-ref.html
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039-ref.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, circle(0%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 20px;
-    width: 20px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px; top: 0px; left: 0px;"></div>
-    <div class="box" style="height: 12px; top: 12px; left: 0px;"></div>
-    <div class="box" style="height: 36px; top: 24px; left: 0px;"></div>
-    <div class="box" style="height: 36px; top: 60px; left: 0px;"></div>
-    <div class="box" style="height: 12px; top: 96px; left: 0px;"></div>
-    <div class="box" style="height: 12px; top: 108px; left: 0px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-039.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, circle(0%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-039-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape circle(0%) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    shape-outside: circle(0%) border-box;
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-040.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, circle(closest-side at left center) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-039-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape circle(closest-side at left center) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    shape-outside: circle(closest-side at left center) border-box;
-    clip-path: circle(closest-side at left center) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045-ref.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, circle(0%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    direction: rtl;
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 20px;
-    width: 20px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px; top: 0px; right: 0px;"></div>
-    <div class="box" style="height: 12px; top: 12px; right: 0px;"></div>
-    <div class="box" style="height: 36px; top: 24px; right: 0px;"></div>
-    <div class="box" style="height: 36px; top: 60px; right: 0px;"></div>
-    <div class="box" style="height: 12px; top: 96px; right: 0px;"></div>
-    <div class="box" style="height: 12px; top: 108px; right: 0px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-045.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, circle(0%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-045-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape circle(0%) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    shape-outside: circle(0%) border-box;
-    clip-path: circle(0%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-046.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, circle(closest-side at right center) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-045-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape circle(closest-side at right center) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    shape-outside: circle(closest-side at right center) border-box;
-    clip-path: circle(closest-side at right center) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 10px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 12px;"></div>
-    <div class="box" style="height: 12px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018-ref.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, inset(50%) reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px; top: 0; left: 0;"></div>
-    <div class="box" style="height: 36px; top: 24px; left: 0;"></div>
-    <div class="box" style="height: 36px; top: 60px; left: 0;"></div>
-    <div class="box" style="height: 24px; top: 96px; left: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-018.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, inset(50%)</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-018-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape inset(50%) value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    shape-outside: inset(50%);
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 24px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019-ref.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, inset(50%) reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    direction: rtl;
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px; top: 0; right: 0;"></div>
-    <div class="box" style="height: 36px; top: 24px; right: 0;"></div>
-    <div class="box" style="height: 36px; top: 60px; right: 0;"></div>
-    <div class="box" style="height: 24px; top: 96px; right: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-019.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, inset(50%)</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-019-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape inset(50%) value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    shape-outside: inset(50%);
-    clip-path: inset(50%);
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 200px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 24px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 36px;"></div>
-    <div class="box" style="height: 24px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026-ref.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(60px 20px, 100px 60px) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px; top: 0; left: 0;"></div>
-    <div class="long box" style="height: 30px; top: 30px; left: 0;"></div>
-    <div class="long box" style="height: 20px; top: 60px; left: 0;"></div>
-    <div class="long box" style="height: 20px; top: 80px; left: 0;"></div>
-    <div class="long box" style="height: 30px; top: 100px; left: 0;"></div>
-    <div class="long box" style="height: 30px; top: 130px; left: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-026.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(60px 20px, 100px 60px) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-026-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the polygon(60px 20px, 100px 60px) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Less than three vertices, resulting an empty area. */
-    shape-outside: polygon(60px 20px, 100px 60px) border-box;
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027-ref.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(60px 20px, 100px 60px) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px; top: 0; right: 0;"></div>
-    <div class="long box" style="height: 30px; top: 30px; right: 0;"></div>
-    <div class="long box" style="height: 20px; top: 60px; right: 0;"></div>
-    <div class="long box" style="height: 20px; top: 80px; right: 0;"></div>
-    <div class="long box" style="height: 30px; top: 100px; right: 0;"></div>
-    <div class="long box" style="height: 30px; top: 130px; right: 0;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-027.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(60px 20px, 100px 60px) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-027-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the polygon(60px 20px, 100px 60px) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Less than three vertices, resulting an empty area. */
-    shape-outside: polygon(60px 20px, 100px 60px) border-box;
-    clip-path: polygon(60px 20px, 100px 60px) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-028.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-026-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the left float shape defines an empty float area by the polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* All vertices are collinear, resulting an empty area. */
-    shape-outside: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    clip-path: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-029.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-027-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the right float shape defines an empty float area by the polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* All vertices are collinear, resulting an empty area. */
-    shape-outside: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    clip-path: polygon(50% 50%, 0% 0%, 20% 20%, 100% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-
-  .long {
-    width: 200px;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 20px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-    <div class="long box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030-ref.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* Omit shape-outside */
-    clip-path: polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px; top: 0; left: 80px;"></div>
-    <div class="box" style="height: 30px; top: 30px; left: 80px;"></div>
-    <div class="box" style="height: 20px; top: 60px; left: 80px;"></div>
-    <div class="box" style="height: 20px; top: 80px; left: 80px;"></div>
-    <div class="box" style="height: 30px; top: 100px; left: 80px;"></div>
-    <div class="box" style="height: 30px; top: 130px; left: 80px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-030.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float left, polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-030-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box value.">
-  <style>
-  .container {
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: left;
-    /* polygon contains horizontal lines. */
-    shape-outside: polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box;
-    clip-path: polygon(0% 0%, 50% 0%, 100% 0%, 50% 0%, 50% 100%, 100% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031-ref.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box reference</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <style>
-  .container {
-    direction: rtl;
-    position: absolute;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* Omit shape-outside */
-    clip-path: polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    border: 20px solid lightgreen;
-    margin: 20px;
-    background-color: orange;
-  }
-
-  .box {
-    position: absolute;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px; top: 0; right: 80px;"></div>
-    <div class="box" style="height: 30px; top: 30px; right: 80px;"></div>
-    <div class="box" style="height: 20px; top: 60px; right: 80px;"></div>
-    <div class="box" style="height: 20px; top: 80px; right: 80px;"></div>
-    <div class="box" style="height: 30px; top: 100px; right: 80px;"></div>
-    <div class="box" style="height: 30px; top: 130px; right: 80px;"></div>
-  </body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-031.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-  <meta charset="utf-8">
-  <title>CSS Shape Test: float right, polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box</title>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-031-ref.html">
-  <meta name="flags" content="">
-  <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box value.">
-  <style>
-  .container {
-    direction: rtl;
-    width: 200px;
-    line-height: 0;
-  }
-
-  .shape {
-    float: right;
-    /* polygon contains horizontal lines. */
-    shape-outside: polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box;
-    clip-path: polygon(100% 0%, 50% 0%, 0% 0%, 50% 0%, 50% 100%, 0% 100%, 50% 100%) border-box;
-    box-sizing: content-box;
-    height: 40px;
-    width: 40px;
-    padding: 20px;
-    margin: 20px;
-    border: 20px solid lightgreen;
-    background-color: orange;
-  }
-
-  .box {
-    display: inline-block;
-    width: 80px;
-    background-color: blue;
-  }
-  </style>
-
-  <body class="container">
-    <div class="shape"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 20px;"></div>
-    <div class="box" style="height: 30px;"></div>
-    <div class="box" style="height: 30px;"></div>
-  </body>
-</html>