diff --git a/layout/reftests/xul/colors-16x8-noSize.svg b/layout/reftests/xul/colors-16x8-noSize.svg
deleted file mode 100644
index db715d875ee4..000000000000
--- a/layout/reftests/xul/colors-16x8-noSize.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This SVG file has an aspect-ratio (from its viewBox attribute),
-     but no intrinsic size.
--->
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 16 8">
-  <rect x="0" y="0" width="8px" height="4px" style="fill: blue"/>
-  <rect x="8" y="0" width="8px" height="4px" style="fill: black"/>
-  <rect x="0" y="4" width="8px" height="4px" style="fill: rgb(255,128,128)"/>
-  <rect x="8" y="4" width="8px" height="4px" style="fill: lime"/>
-</svg>
diff --git a/layout/reftests/xul/colors-16x8-parDefault.svg b/layout/reftests/xul/colors-16x8-parDefault.svg
deleted file mode 100644
index 1b0bca07375a..000000000000
--- a/layout/reftests/xul/colors-16x8-parDefault.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This SVG file has the default preserveAspectRatio (xMidyMid meet).
-
-     If it's rendered via e.g. a square <img> element with 'object-fit: fill',
-     the SVG will receive the <img>'s full content-box to use as its viewport.
-     But, importantly, its viewBox-region should NOT be stretched/squashed to
-     fill this viewport; instead, the viewBox will scale *proportionally* until
-     it *just* fits inside the viewport (the <img>), without overflowing, and
-     it'll be centered inside the viewport in whichever dimension has extra
-     space available. (This is what "xMidYMid meet" requires.)
--->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="16" height="8" viewBox="0 0 16 8">
-  <rect x="0" y="0" width="8px" height="4px" style="fill: blue"/>
-  <rect x="8" y="0" width="8px" height="4px" style="fill: black"/>
-  <rect x="0" y="4" width="8px" height="4px" style="fill: rgb(255,128,128)"/>
-  <rect x="8" y="4" width="8px" height="4px" style="fill: lime"/>
-</svg>
diff --git a/layout/reftests/xul/colors-16x8.png b/layout/reftests/xul/colors-16x8.png
deleted file mode 100644
index bd238458713f..000000000000
Binary files a/layout/reftests/xul/colors-16x8.png and /dev/null differ
diff --git a/layout/reftests/xul/colors-16x8.svg b/layout/reftests/xul/colors-16x8.svg
deleted file mode 100644
index 08e36594026d..000000000000
--- a/layout/reftests/xul/colors-16x8.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This SVG file is meant to mimic colors-8x16.png as closely
-     as possible. In particular, this SVG has:
-      (1) an intrinsic size (from the 'width' & 'height' attributes)
-      (2) preserveAspectRatio="none", allowing it to stretch in the
-          same way that a raster image would.
--->
-<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none"
-     width="16" height="8" viewBox="0 0 16 8">
-  <rect x="0" y="0" width="8px" height="4px" style="fill: blue"/>
-  <rect x="8" y="0" width="8px" height="4px" style="fill: black"/>
-  <rect x="0" y="4" width="8px" height="4px" style="fill: rgb(255,128,128)"/>
-  <rect x="8" y="4" width="8px" height="4px" style="fill: lime"/>
-</svg>
diff --git a/layout/reftests/xul/colors-8x16-noSize.svg b/layout/reftests/xul/colors-8x16-noSize.svg
deleted file mode 100644
index e741537b9307..000000000000
--- a/layout/reftests/xul/colors-8x16-noSize.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This SVG file has an aspect-ratio (from its viewBox attribute),
-     but no intrinsic size.
--->
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 8 16">
-  <rect x="0" y="0" width="4px" height="8px" style="fill: blue"/>
-  <rect x="4" y="0" width="4px" height="8px" style="fill: black"/>
-  <rect x="0" y="8" width="4px" height="8px" style="fill: rgb(255,128,128)"/>
-  <rect x="4" y="8" width="4px" height="8px" style="fill: lime"/>
-</svg>
diff --git a/layout/reftests/xul/colors-8x16-parDefault.svg b/layout/reftests/xul/colors-8x16-parDefault.svg
deleted file mode 100644
index ec8c59dcbdbe..000000000000
--- a/layout/reftests/xul/colors-8x16-parDefault.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This SVG file has the default preserveAspectRatio (xMidyMid meet).
-
-     If it's rendered via e.g. a square <img> element with 'object-fit: fill',
-     the SVG will receive the <img>'s full content-box to use as its viewport.
-     But, importantly, its viewBox-region should NOT be stretched/squashed to
-     fill this viewport; instead, the viewBox will scale *proportionally* until
-     it *just* fits inside the viewport (the <img>), without overflowing, and
-     it'll be centered inside the viewport in whichever dimension has extra
-     space available. (This is what "xMidYMid meet" requires.)
--->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="8" height="16" viewBox="0 0 8 16">
-  <rect x="0" y="0" width="4px" height="8px" style="fill: blue"/>
-  <rect x="4" y="0" width="4px" height="8px" style="fill: black"/>
-  <rect x="0" y="8" width="4px" height="8px" style="fill: rgb(255,128,128)"/>
-  <rect x="4" y="8" width="4px" height="8px" style="fill: lime"/>
-</svg>
diff --git a/layout/reftests/xul/colors-8x16.png b/layout/reftests/xul/colors-8x16.png
deleted file mode 100644
index 596fdb389d6c..000000000000
Binary files a/layout/reftests/xul/colors-8x16.png and /dev/null differ
diff --git a/layout/reftests/xul/colors-8x16.svg b/layout/reftests/xul/colors-8x16.svg
deleted file mode 100644
index c336e3af1bd6..000000000000
--- a/layout/reftests/xul/colors-8x16.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This SVG file is meant to mimic colors-8x16.png as closely
-     as possible. In particular, this SVG has:
-      (1) an intrinsic size (from the 'width' & 'height' attributes)
-      (2) preserveAspectRatio="none", allowing it to stretch in the
-          same way that a raster image would.
--->
-<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none"
-     width="8" height="16" viewBox="0 0 8 16">
-  <rect x="0" y="0" width="4px" height="8px" style="fill: blue"/>
-  <rect x="4" y="0" width="4px" height="8px" style="fill: black"/>
-  <rect x="0" y="8" width="4px" height="8px" style="fill: rgb(255,128,128)"/>
-  <rect x="4" y="8" width="4px" height="8px" style="fill: lime"/>
-</svg>
diff --git a/layout/reftests/xul/generate-object-fit-xul-tests.sh b/layout/reftests/xul/generate-object-fit-xul-tests.sh
deleted file mode 100644
index f524d3b2cf27..000000000000
--- a/layout/reftests/xul/generate-object-fit-xul-tests.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-#
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-#
-# Script to generate XUL <image> reftest files, from corresponding reftest
-# files that use <img>.
-#
-# This script expects to be run from this working directory:
-#  mozilla-central/layout/reftests/w3c-css/submitted/images3
-
-XUL_REFTEST_PATH="../../../xul"
-
-imageFileArr=("colors-16x8.png"            "colors-8x16.png"
-              "colors-16x8.svg"            "colors-8x16.svg"
-              "colors-16x8-noSize.svg"     "colors-8x16-noSize.svg"
-              "colors-16x8-parDefault.svg" "colors-8x16-parDefault.svg")
-numImageFiles=${#imageFileArr[@]}
-
-# Copy image files
-for ((i = 0; i < $numImageFiles; i++)); do
-  imageFileName=${imageFileArr[$i]}
-  imageDest=$XUL_REFTEST_PATH/$imageFileName
-
-  echo "Copying $imageDest."
-  hg cp support/$imageFileName $imageDest
-done
-
-# Add comment & default-preferences line to reftest.list in dest directory:
-reftestListFileName="$XUL_REFTEST_PATH/reftest.list"
-echo "
-# Tests for XUL <image> with 'object-fit' & 'object-position':
-# These tests should be very similar to tests in our w3c-css/submitted/images3
-# reftest directory. They live here because they use XUL, and it
-# wouldn't be fair of us to make a W3C testsuite implicitly depend on XUL.
-default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)"\
-  >> $reftestListFileName
-
-# Loop across all object-fit tests that use <img> ("i" suffix):
-for origTestName in object-fit*i.html; do
-  newTestName=$(echo $origTestName |
-                sed "s/i.html/.xul/")
-
-  # Find the corresponding reference case:
-  referenceName=$(echo $origTestName |
-                  sed "s/i.html/-ref.html/")
-
-  # Generate reference file (dropping "support" subdir from image paths):
-  echo "Copying $referenceName to $XUL_REFTEST_PATH."
-  newReferenceFullPath=$XUL_REFTEST_PATH/$referenceName
-  hg cp $referenceName $newReferenceFullPath
-  sed -i "s,support/,," $newReferenceFullPath
-
-  # Generate testcase
-  # (converting <video poster="support/foo.png"> to <video src="foo.webm">):
-  echo "Generating $newTestName from $origTestName."
-  newTestFullPath=$XUL_REFTEST_PATH/$newTestName
-  hg cp $origTestName $newTestFullPath
-
-  # Replace doctype with XML decl:
-  sed -i "s/<!DOCTYPE html>/<?xml version=\"1.0\"?>/" $newTestFullPath
-
-  # Replace html tags with window tags:
-  sed -i "s,<html>,<window xmlns=\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\">," $newTestFullPath
-  sed -i "s,</html>,</window>," $newTestFullPath
-
-  # Delete a bunch of HTML (not XUL) / W3C-testsuite boilerplate:
-  sed -i "/head>/d" $newTestFullPath # Delete head open & close tags
-  sed -i "/body>/d" $newTestFullPath # Delete body open & close tags
-  sed -i "/<meta/d" $newTestFullPath # Delete meta charset tag
-  sed -i "/<title/d" $newTestFullPath # Delete title line
-  sed -i "/<link/d" $newTestFullPath # Delete link tags
-
-  # Add 4px to all sizes, since in XUL, sizes are for border-box
-  # instead of content-box.
-  sed -i "s/ 48px/ 52px/" $newTestFullPath
-  sed -i "s/ 32px/ 36px/" $newTestFullPath
-  sed -i "s/ 8px/ 12px/" $newTestFullPath
-
-  # Fix style open/close tags, and add 8px of padding on outer <window> to
-  # match our HTML reference case, and change style rule to target <image>:
-  sed -i "s,  <style type=\"text/css\">,\<style xmlns=\"http://www.w3.org/1999/xhtml\"><![CDATA[\n      window { padding: 8px; }," $newTestFullPath
-  sed -i "s,  </style>,]]></style>," $newTestFullPath
-  sed -i "s/img {/image {/" $newTestFullPath
-
-  sed -i "s,support/,," $newTestFullPath
-  sed -i "s,<img\(.*\)>,<image\1/>," $newTestFullPath
-  sed -i "s,  <!--,<hbox>\n    <!--," $newTestFullPath
-  sed -i "s,  <br>,</hbox>," $newTestFullPath
-
-  # Update reftest manifest:
-  echo "== $newTestName $referenceName" \
-    >> $reftestListFileName
-
-done
diff --git a/layout/reftests/xul/generate-object-position-xul-tests.sh b/layout/reftests/xul/generate-object-position-xul-tests.sh
deleted file mode 100644
index b03b24579011..000000000000
--- a/layout/reftests/xul/generate-object-position-xul-tests.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-#
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-#
-# Script to generate XUL <image> reftest files, from corresponding reftest
-# files that use <img>.
-#
-# This script expects to be run from this working directory:
-#  mozilla-central/layout/reftests/w3c-css/submitted/images3
-# and it expects to be run *after* generate-object-fit-xul-tests.sh, since the
-# copied test files will make use of image resources which are copied by that
-# other script.
-
-XUL_REFTEST_PATH="../../../xul"
-
-reftestListFileName="$XUL_REFTEST_PATH/reftest.list"
-
-# Loop across all object-position tests that use <img> ("i" suffix):
-for origTestName in object-position-png-*i.html; do
-  newTestName=$(echo $origTestName |
-                sed "s/i.html/.xul/")
-
-  # Find the corresponding reference case:
-  referenceName=$(echo $origTestName |
-                  sed "s/i.html/-ref.html/")
-
-  # Generate reference file (dropping "support" subdir from image paths):
-  echo "Copying $referenceName to $XUL_REFTEST_PATH."
-  newReferenceFullPath=$XUL_REFTEST_PATH/$referenceName
-  hg cp $referenceName $newReferenceFullPath
-  sed -i "s,support/,," $newReferenceFullPath
-
-  # Generate testcase
-  # (converting <video poster="support/foo.png"> to <video src="foo.webm">):
-  echo "Generating $newTestName from $origTestName."
-  newTestFullPath=$XUL_REFTEST_PATH/$newTestName
-  hg cp $origTestName $newTestFullPath
-
-  # Replace doctype with XML decl:
-  sed -i "s/<!DOCTYPE html>/<?xml version=\"1.0\"?>/" $newTestFullPath
-
-  # Replace html tags with window tags:
-  sed -i "s,<html>,<window xmlns=\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\">," $newTestFullPath
-
-  # Delete a bunch of HTML (not XUL) / W3C-testsuite boilerplate:
-  sed -i "/head>/d" $newTestFullPath # Delete head open & close tags
-  sed -i "/body>/d" $newTestFullPath # Delete body open & close tags
-  sed -i "/<meta/d" $newTestFullPath # Delete meta charset tag
-  sed -i "/<title/d" $newTestFullPath # Delete title line
-  sed -i "/<link/d" $newTestFullPath # Delete link tags
-
-  # Fix style open/close tags, and add 8px of padding on outer <window> to
-  # match our HTML reference case, and change style rule to target <image>.
-  # Also, add <hbox> to wrap the image elements.
-  sed -i "s,  <style type=\"text/css\">,\<style xmlns=\"http://www.w3.org/1999/xhtml\"><![CDATA[\n      window { padding: 8px; }," $newTestFullPath
-  sed -i "s,  </style>,]]></style>\n  <hbox>," $newTestFullPath
-  sed -i "s,</html>,  </hbox>\n</window>," $newTestFullPath
-  sed -i "s/img {/image {/" $newTestFullPath
-
-  sed -i "s,support/,," $newTestFullPath
-  sed -i "s,<img\(.*\)>,<image\1/>," $newTestFullPath
-
-  # Update reftest manifest:
-  echo "== $newTestName $referenceName" \
-    >> $reftestListFileName
-
-done
diff --git a/layout/reftests/xul/object-fit-contain-png-001-ref.html b/layout/reftests/xul/object-fit-contain-png-001-ref.html
deleted file mode 100644
index 2f96fbfd81e4..000000000000
--- a/layout/reftests/xul/object-fit-contain-png-001-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-png-001.xul b/layout/reftests/xul/object-fit-contain-png-001.xul
deleted file mode 100644
index dfd57d71ef13..000000000000
--- a/layout/reftests/xul/object-fit-contain-png-001.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.png" class="bigWide tr"/>
-    <image src="colors-16x8.png" class="bigWide bl"/>
-    <image src="colors-16x8.png" class="bigWide tl"/>
-    <image src="colors-16x8.png" class="bigWide br"/>
-    <image src="colors-16x8.png" class="bigWide tc"/>
-    <image src="colors-16x8.png" class="bigWide cr"/>
-    <image src="colors-16x8.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.png" class="bigTall tr"/>
-    <image src="colors-16x8.png" class="bigTall bl"/>
-    <image src="colors-16x8.png" class="bigTall tl"/>
-    <image src="colors-16x8.png" class="bigTall br"/>
-    <image src="colors-16x8.png" class="bigTall tc"/>
-    <image src="colors-16x8.png" class="bigTall cr"/>
-    <image src="colors-16x8.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.png" class="small tr"/>
-    <image src="colors-16x8.png" class="small bl"/>
-    <image src="colors-16x8.png" class="small tl"/>
-    <image src="colors-16x8.png" class="small br"/>
-    <image src="colors-16x8.png" class="small tc"/>
-    <image src="colors-16x8.png" class="small cr"/>
-    <image src="colors-16x8.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-contain-png-002-ref.html b/layout/reftests/xul/object-fit-contain-png-002-ref.html
deleted file mode 100644
index bff827c5c647..000000000000
--- a/layout/reftests/xul/object-fit-contain-png-002-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-png-002.xul b/layout/reftests/xul/object-fit-contain-png-002.xul
deleted file mode 100644
index 6524e9303cc3..000000000000
--- a/layout/reftests/xul/object-fit-contain-png-002.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.png" class="bigWide tr"/>
-    <image src="colors-8x16.png" class="bigWide bl"/>
-    <image src="colors-8x16.png" class="bigWide tl"/>
-    <image src="colors-8x16.png" class="bigWide br"/>
-    <image src="colors-8x16.png" class="bigWide tc"/>
-    <image src="colors-8x16.png" class="bigWide cr"/>
-    <image src="colors-8x16.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.png" class="bigTall tr"/>
-    <image src="colors-8x16.png" class="bigTall bl"/>
-    <image src="colors-8x16.png" class="bigTall tl"/>
-    <image src="colors-8x16.png" class="bigTall br"/>
-    <image src="colors-8x16.png" class="bigTall tc"/>
-    <image src="colors-8x16.png" class="bigTall cr"/>
-    <image src="colors-8x16.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.png" class="small tr"/>
-    <image src="colors-8x16.png" class="small bl"/>
-    <image src="colors-8x16.png" class="small tl"/>
-    <image src="colors-8x16.png" class="small br"/>
-    <image src="colors-8x16.png" class="small tc"/>
-    <image src="colors-8x16.png" class="small cr"/>
-    <image src="colors-8x16.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-contain-svg-001-ref.html b/layout/reftests/xul/object-fit-contain-svg-001-ref.html
deleted file mode 100644
index d532d3414d02..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-001-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.svg");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-svg-001.xul b/layout/reftests/xul/object-fit-contain-svg-001.xul
deleted file mode 100644
index ce5e776b8d30..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-001.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.svg" class="bigWide tr"/>
-    <image src="colors-16x8.svg" class="bigWide bl"/>
-    <image src="colors-16x8.svg" class="bigWide tl"/>
-    <image src="colors-16x8.svg" class="bigWide br"/>
-    <image src="colors-16x8.svg" class="bigWide tc"/>
-    <image src="colors-16x8.svg" class="bigWide cr"/>
-    <image src="colors-16x8.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.svg" class="bigTall tr"/>
-    <image src="colors-16x8.svg" class="bigTall bl"/>
-    <image src="colors-16x8.svg" class="bigTall tl"/>
-    <image src="colors-16x8.svg" class="bigTall br"/>
-    <image src="colors-16x8.svg" class="bigTall tc"/>
-    <image src="colors-16x8.svg" class="bigTall cr"/>
-    <image src="colors-16x8.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.svg" class="small tr"/>
-    <image src="colors-16x8.svg" class="small bl"/>
-    <image src="colors-16x8.svg" class="small tl"/>
-    <image src="colors-16x8.svg" class="small br"/>
-    <image src="colors-16x8.svg" class="small tc"/>
-    <image src="colors-16x8.svg" class="small cr"/>
-    <image src="colors-16x8.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-contain-svg-002-ref.html b/layout/reftests/xul/object-fit-contain-svg-002-ref.html
deleted file mode 100644
index 98262685c9b6..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-002-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.svg");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-svg-002.xul b/layout/reftests/xul/object-fit-contain-svg-002.xul
deleted file mode 100644
index a0135d6b4e9c..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-002.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.svg" class="bigWide tr"/>
-    <image src="colors-8x16.svg" class="bigWide bl"/>
-    <image src="colors-8x16.svg" class="bigWide tl"/>
-    <image src="colors-8x16.svg" class="bigWide br"/>
-    <image src="colors-8x16.svg" class="bigWide tc"/>
-    <image src="colors-8x16.svg" class="bigWide cr"/>
-    <image src="colors-8x16.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.svg" class="bigTall tr"/>
-    <image src="colors-8x16.svg" class="bigTall bl"/>
-    <image src="colors-8x16.svg" class="bigTall tl"/>
-    <image src="colors-8x16.svg" class="bigTall br"/>
-    <image src="colors-8x16.svg" class="bigTall tc"/>
-    <image src="colors-8x16.svg" class="bigTall cr"/>
-    <image src="colors-8x16.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.svg" class="small tr"/>
-    <image src="colors-8x16.svg" class="small bl"/>
-    <image src="colors-8x16.svg" class="small tl"/>
-    <image src="colors-8x16.svg" class="small br"/>
-    <image src="colors-8x16.svg" class="small tc"/>
-    <image src="colors-8x16.svg" class="small cr"/>
-    <image src="colors-8x16.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-contain-svg-003-ref.html b/layout/reftests/xul/object-fit-contain-svg-003-ref.html
deleted file mode 100644
index f8aca453cc32..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-003-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-noSize.svg");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-svg-003.xul b/layout/reftests/xul/object-fit-contain-svg-003.xul
deleted file mode 100644
index 6bbd1a900147..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-003.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-noSize.svg" class="bigWide tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide br"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-noSize.svg" class="bigTall tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall br"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-noSize.svg" class="small tr"/>
-    <image src="colors-16x8-noSize.svg" class="small bl"/>
-    <image src="colors-16x8-noSize.svg" class="small tl"/>
-    <image src="colors-16x8-noSize.svg" class="small br"/>
-    <image src="colors-16x8-noSize.svg" class="small tc"/>
-    <image src="colors-16x8-noSize.svg" class="small cr"/>
-    <image src="colors-16x8-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-contain-svg-004-ref.html b/layout/reftests/xul/object-fit-contain-svg-004-ref.html
deleted file mode 100644
index 7699a15db1a5..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-004-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-noSize.svg");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-svg-004.xul b/layout/reftests/xul/object-fit-contain-svg-004.xul
deleted file mode 100644
index 6c721365ad49..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-004.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-noSize.svg" class="bigWide tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide br"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-noSize.svg" class="bigTall tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall br"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-noSize.svg" class="small tr"/>
-    <image src="colors-8x16-noSize.svg" class="small bl"/>
-    <image src="colors-8x16-noSize.svg" class="small tl"/>
-    <image src="colors-8x16-noSize.svg" class="small br"/>
-    <image src="colors-8x16-noSize.svg" class="small tc"/>
-    <image src="colors-8x16-noSize.svg" class="small cr"/>
-    <image src="colors-8x16-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-contain-svg-005-ref.html b/layout/reftests/xul/object-fit-contain-svg-005-ref.html
deleted file mode 100644
index 6a7c2bfeb117..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-005-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-parDefault.svg");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-svg-005.xul b/layout/reftests/xul/object-fit-contain-svg-005.xul
deleted file mode 100644
index ab481ec0b68c..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-005.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-parDefault.svg" class="small tr"/>
-    <image src="colors-16x8-parDefault.svg" class="small bl"/>
-    <image src="colors-16x8-parDefault.svg" class="small tl"/>
-    <image src="colors-16x8-parDefault.svg" class="small br"/>
-    <image src="colors-16x8-parDefault.svg" class="small tc"/>
-    <image src="colors-16x8-parDefault.svg" class="small cr"/>
-    <image src="colors-16x8-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-contain-svg-006-ref.html b/layout/reftests/xul/object-fit-contain-svg-006-ref.html
deleted file mode 100644
index 412aebc14cab..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-006-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-parDefault.svg");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-contain-svg-006.xul b/layout/reftests/xul/object-fit-contain-svg-006.xul
deleted file mode 100644
index 678dfba6dfd4..000000000000
--- a/layout/reftests/xul/object-fit-contain-svg-006.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: contain;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-parDefault.svg" class="small tr"/>
-    <image src="colors-8x16-parDefault.svg" class="small bl"/>
-    <image src="colors-8x16-parDefault.svg" class="small tl"/>
-    <image src="colors-8x16-parDefault.svg" class="small br"/>
-    <image src="colors-8x16-parDefault.svg" class="small tc"/>
-    <image src="colors-8x16-parDefault.svg" class="small cr"/>
-    <image src="colors-8x16-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-png-001-ref.html b/layout/reftests/xul/object-fit-cover-png-001-ref.html
deleted file mode 100644
index fa4f7767025c..000000000000
--- a/layout/reftests/xul/object-fit-cover-png-001-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.png");
-        background-size: cover;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-png-001.xul b/layout/reftests/xul/object-fit-cover-png-001.xul
deleted file mode 100644
index bd2f98f0b454..000000000000
--- a/layout/reftests/xul/object-fit-cover-png-001.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.png" class="bigWide tr"/>
-    <image src="colors-16x8.png" class="bigWide bl"/>
-    <image src="colors-16x8.png" class="bigWide tl"/>
-    <image src="colors-16x8.png" class="bigWide br"/>
-    <image src="colors-16x8.png" class="bigWide tc"/>
-    <image src="colors-16x8.png" class="bigWide cr"/>
-    <image src="colors-16x8.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.png" class="bigTall tr"/>
-    <image src="colors-16x8.png" class="bigTall bl"/>
-    <image src="colors-16x8.png" class="bigTall tl"/>
-    <image src="colors-16x8.png" class="bigTall br"/>
-    <image src="colors-16x8.png" class="bigTall tc"/>
-    <image src="colors-16x8.png" class="bigTall cr"/>
-    <image src="colors-16x8.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.png" class="small tr"/>
-    <image src="colors-16x8.png" class="small bl"/>
-    <image src="colors-16x8.png" class="small tl"/>
-    <image src="colors-16x8.png" class="small br"/>
-    <image src="colors-16x8.png" class="small tc"/>
-    <image src="colors-16x8.png" class="small cr"/>
-    <image src="colors-16x8.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-png-002-ref.html b/layout/reftests/xul/object-fit-cover-png-002-ref.html
deleted file mode 100644
index eb4c3dcad30e..000000000000
--- a/layout/reftests/xul/object-fit-cover-png-002-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.png");
-        background-size: cover;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-png-002.xul b/layout/reftests/xul/object-fit-cover-png-002.xul
deleted file mode 100644
index 093c3e6fb74c..000000000000
--- a/layout/reftests/xul/object-fit-cover-png-002.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.png" class="bigWide tr"/>
-    <image src="colors-8x16.png" class="bigWide bl"/>
-    <image src="colors-8x16.png" class="bigWide tl"/>
-    <image src="colors-8x16.png" class="bigWide br"/>
-    <image src="colors-8x16.png" class="bigWide tc"/>
-    <image src="colors-8x16.png" class="bigWide cr"/>
-    <image src="colors-8x16.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.png" class="bigTall tr"/>
-    <image src="colors-8x16.png" class="bigTall bl"/>
-    <image src="colors-8x16.png" class="bigTall tl"/>
-    <image src="colors-8x16.png" class="bigTall br"/>
-    <image src="colors-8x16.png" class="bigTall tc"/>
-    <image src="colors-8x16.png" class="bigTall cr"/>
-    <image src="colors-8x16.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.png" class="small tr"/>
-    <image src="colors-8x16.png" class="small bl"/>
-    <image src="colors-8x16.png" class="small tl"/>
-    <image src="colors-8x16.png" class="small br"/>
-    <image src="colors-8x16.png" class="small tc"/>
-    <image src="colors-8x16.png" class="small cr"/>
-    <image src="colors-8x16.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-svg-001-ref.html b/layout/reftests/xul/object-fit-cover-svg-001-ref.html
deleted file mode 100644
index 4f479d37d3b7..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-001-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.svg");
-        background-size: cover;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-svg-001.xul b/layout/reftests/xul/object-fit-cover-svg-001.xul
deleted file mode 100644
index cb8d7e2dc36f..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-001.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.svg" class="bigWide tr"/>
-    <image src="colors-16x8.svg" class="bigWide bl"/>
-    <image src="colors-16x8.svg" class="bigWide tl"/>
-    <image src="colors-16x8.svg" class="bigWide br"/>
-    <image src="colors-16x8.svg" class="bigWide tc"/>
-    <image src="colors-16x8.svg" class="bigWide cr"/>
-    <image src="colors-16x8.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.svg" class="bigTall tr"/>
-    <image src="colors-16x8.svg" class="bigTall bl"/>
-    <image src="colors-16x8.svg" class="bigTall tl"/>
-    <image src="colors-16x8.svg" class="bigTall br"/>
-    <image src="colors-16x8.svg" class="bigTall tc"/>
-    <image src="colors-16x8.svg" class="bigTall cr"/>
-    <image src="colors-16x8.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.svg" class="small tr"/>
-    <image src="colors-16x8.svg" class="small bl"/>
-    <image src="colors-16x8.svg" class="small tl"/>
-    <image src="colors-16x8.svg" class="small br"/>
-    <image src="colors-16x8.svg" class="small tc"/>
-    <image src="colors-16x8.svg" class="small cr"/>
-    <image src="colors-16x8.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-svg-002-ref.html b/layout/reftests/xul/object-fit-cover-svg-002-ref.html
deleted file mode 100644
index 94ee0494390b..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-002-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.svg");
-        background-size: cover;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-svg-002.xul b/layout/reftests/xul/object-fit-cover-svg-002.xul
deleted file mode 100644
index 73b0a70e8cc1..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-002.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.svg" class="bigWide tr"/>
-    <image src="colors-8x16.svg" class="bigWide bl"/>
-    <image src="colors-8x16.svg" class="bigWide tl"/>
-    <image src="colors-8x16.svg" class="bigWide br"/>
-    <image src="colors-8x16.svg" class="bigWide tc"/>
-    <image src="colors-8x16.svg" class="bigWide cr"/>
-    <image src="colors-8x16.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.svg" class="bigTall tr"/>
-    <image src="colors-8x16.svg" class="bigTall bl"/>
-    <image src="colors-8x16.svg" class="bigTall tl"/>
-    <image src="colors-8x16.svg" class="bigTall br"/>
-    <image src="colors-8x16.svg" class="bigTall tc"/>
-    <image src="colors-8x16.svg" class="bigTall cr"/>
-    <image src="colors-8x16.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.svg" class="small tr"/>
-    <image src="colors-8x16.svg" class="small bl"/>
-    <image src="colors-8x16.svg" class="small tl"/>
-    <image src="colors-8x16.svg" class="small br"/>
-    <image src="colors-8x16.svg" class="small tc"/>
-    <image src="colors-8x16.svg" class="small cr"/>
-    <image src="colors-8x16.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-svg-003-ref.html b/layout/reftests/xul/object-fit-cover-svg-003-ref.html
deleted file mode 100644
index 3cc59936ffc4..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-003-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-noSize.svg");
-        background-size: cover;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-svg-003.xul b/layout/reftests/xul/object-fit-cover-svg-003.xul
deleted file mode 100644
index 852067d0d658..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-003.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-noSize.svg" class="bigWide tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide br"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-noSize.svg" class="bigTall tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall br"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-noSize.svg" class="small tr"/>
-    <image src="colors-16x8-noSize.svg" class="small bl"/>
-    <image src="colors-16x8-noSize.svg" class="small tl"/>
-    <image src="colors-16x8-noSize.svg" class="small br"/>
-    <image src="colors-16x8-noSize.svg" class="small tc"/>
-    <image src="colors-16x8-noSize.svg" class="small cr"/>
-    <image src="colors-16x8-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-svg-004-ref.html b/layout/reftests/xul/object-fit-cover-svg-004-ref.html
deleted file mode 100644
index 1d7473677a85..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-004-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-noSize.svg");
-        background-size: cover;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-svg-004.xul b/layout/reftests/xul/object-fit-cover-svg-004.xul
deleted file mode 100644
index db5721414a28..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-004.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-noSize.svg" class="bigWide tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide br"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-noSize.svg" class="bigTall tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall br"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-noSize.svg" class="small tr"/>
-    <image src="colors-8x16-noSize.svg" class="small bl"/>
-    <image src="colors-8x16-noSize.svg" class="small tl"/>
-    <image src="colors-8x16-noSize.svg" class="small br"/>
-    <image src="colors-8x16-noSize.svg" class="small tc"/>
-    <image src="colors-8x16-noSize.svg" class="small cr"/>
-    <image src="colors-8x16-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-svg-005-ref.html b/layout/reftests/xul/object-fit-cover-svg-005-ref.html
deleted file mode 100644
index 5e8a68b712dc..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-005-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-parDefault.svg");
-        background-size: cover;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-svg-005.xul b/layout/reftests/xul/object-fit-cover-svg-005.xul
deleted file mode 100644
index 00699ff28322..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-005.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-parDefault.svg" class="small tr"/>
-    <image src="colors-16x8-parDefault.svg" class="small bl"/>
-    <image src="colors-16x8-parDefault.svg" class="small tl"/>
-    <image src="colors-16x8-parDefault.svg" class="small br"/>
-    <image src="colors-16x8-parDefault.svg" class="small tc"/>
-    <image src="colors-16x8-parDefault.svg" class="small cr"/>
-    <image src="colors-16x8-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-cover-svg-006-ref.html b/layout/reftests/xul/object-fit-cover-svg-006-ref.html
deleted file mode 100644
index 878bd6a33fef..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-006-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-parDefault.svg");
-        background-size: cover;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-cover-svg-006.xul b/layout/reftests/xul/object-fit-cover-svg-006.xul
deleted file mode 100644
index 1fbf905cb822..000000000000
--- a/layout/reftests/xul/object-fit-cover-svg-006.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: cover;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-parDefault.svg" class="small tr"/>
-    <image src="colors-8x16-parDefault.svg" class="small bl"/>
-    <image src="colors-8x16-parDefault.svg" class="small tl"/>
-    <image src="colors-8x16-parDefault.svg" class="small br"/>
-    <image src="colors-8x16-parDefault.svg" class="small tc"/>
-    <image src="colors-8x16-parDefault.svg" class="small cr"/>
-    <image src="colors-8x16-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-png-001-ref.html b/layout/reftests/xul/object-fit-fill-png-001-ref.html
deleted file mode 100644
index 0e8d1bd82201..000000000000
--- a/layout/reftests/xul/object-fit-fill-png-001-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.png");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-png-001.xul b/layout/reftests/xul/object-fit-fill-png-001.xul
deleted file mode 100644
index 96a785a80fa9..000000000000
--- a/layout/reftests/xul/object-fit-fill-png-001.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.png" class="bigWide tr"/>
-    <image src="colors-16x8.png" class="bigWide bl"/>
-    <image src="colors-16x8.png" class="bigWide tl"/>
-    <image src="colors-16x8.png" class="bigWide br"/>
-    <image src="colors-16x8.png" class="bigWide tc"/>
-    <image src="colors-16x8.png" class="bigWide cr"/>
-    <image src="colors-16x8.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.png" class="bigTall tr"/>
-    <image src="colors-16x8.png" class="bigTall bl"/>
-    <image src="colors-16x8.png" class="bigTall tl"/>
-    <image src="colors-16x8.png" class="bigTall br"/>
-    <image src="colors-16x8.png" class="bigTall tc"/>
-    <image src="colors-16x8.png" class="bigTall cr"/>
-    <image src="colors-16x8.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.png" class="small tr"/>
-    <image src="colors-16x8.png" class="small bl"/>
-    <image src="colors-16x8.png" class="small tl"/>
-    <image src="colors-16x8.png" class="small br"/>
-    <image src="colors-16x8.png" class="small tc"/>
-    <image src="colors-16x8.png" class="small cr"/>
-    <image src="colors-16x8.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-png-002-ref.html b/layout/reftests/xul/object-fit-fill-png-002-ref.html
deleted file mode 100644
index 8e22d3d57e7c..000000000000
--- a/layout/reftests/xul/object-fit-fill-png-002-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.png");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-png-002.xul b/layout/reftests/xul/object-fit-fill-png-002.xul
deleted file mode 100644
index 81ab3fd2c278..000000000000
--- a/layout/reftests/xul/object-fit-fill-png-002.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.png" class="bigWide tr"/>
-    <image src="colors-8x16.png" class="bigWide bl"/>
-    <image src="colors-8x16.png" class="bigWide tl"/>
-    <image src="colors-8x16.png" class="bigWide br"/>
-    <image src="colors-8x16.png" class="bigWide tc"/>
-    <image src="colors-8x16.png" class="bigWide cr"/>
-    <image src="colors-8x16.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.png" class="bigTall tr"/>
-    <image src="colors-8x16.png" class="bigTall bl"/>
-    <image src="colors-8x16.png" class="bigTall tl"/>
-    <image src="colors-8x16.png" class="bigTall br"/>
-    <image src="colors-8x16.png" class="bigTall tc"/>
-    <image src="colors-8x16.png" class="bigTall cr"/>
-    <image src="colors-8x16.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.png" class="small tr"/>
-    <image src="colors-8x16.png" class="small bl"/>
-    <image src="colors-8x16.png" class="small tl"/>
-    <image src="colors-8x16.png" class="small br"/>
-    <image src="colors-8x16.png" class="small tc"/>
-    <image src="colors-8x16.png" class="small cr"/>
-    <image src="colors-8x16.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-svg-001-ref.html b/layout/reftests/xul/object-fit-fill-svg-001-ref.html
deleted file mode 100644
index 13984a919b29..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-001-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.svg");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-svg-001.xul b/layout/reftests/xul/object-fit-fill-svg-001.xul
deleted file mode 100644
index c0490ca02191..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-001.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.svg" class="bigWide tr"/>
-    <image src="colors-16x8.svg" class="bigWide bl"/>
-    <image src="colors-16x8.svg" class="bigWide tl"/>
-    <image src="colors-16x8.svg" class="bigWide br"/>
-    <image src="colors-16x8.svg" class="bigWide tc"/>
-    <image src="colors-16x8.svg" class="bigWide cr"/>
-    <image src="colors-16x8.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.svg" class="bigTall tr"/>
-    <image src="colors-16x8.svg" class="bigTall bl"/>
-    <image src="colors-16x8.svg" class="bigTall tl"/>
-    <image src="colors-16x8.svg" class="bigTall br"/>
-    <image src="colors-16x8.svg" class="bigTall tc"/>
-    <image src="colors-16x8.svg" class="bigTall cr"/>
-    <image src="colors-16x8.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.svg" class="small tr"/>
-    <image src="colors-16x8.svg" class="small bl"/>
-    <image src="colors-16x8.svg" class="small tl"/>
-    <image src="colors-16x8.svg" class="small br"/>
-    <image src="colors-16x8.svg" class="small tc"/>
-    <image src="colors-16x8.svg" class="small cr"/>
-    <image src="colors-16x8.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-svg-002-ref.html b/layout/reftests/xul/object-fit-fill-svg-002-ref.html
deleted file mode 100644
index efd8e4f6f004..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-002-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.svg");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-svg-002.xul b/layout/reftests/xul/object-fit-fill-svg-002.xul
deleted file mode 100644
index 2ee41d6294a1..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-002.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.svg" class="bigWide tr"/>
-    <image src="colors-8x16.svg" class="bigWide bl"/>
-    <image src="colors-8x16.svg" class="bigWide tl"/>
-    <image src="colors-8x16.svg" class="bigWide br"/>
-    <image src="colors-8x16.svg" class="bigWide tc"/>
-    <image src="colors-8x16.svg" class="bigWide cr"/>
-    <image src="colors-8x16.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.svg" class="bigTall tr"/>
-    <image src="colors-8x16.svg" class="bigTall bl"/>
-    <image src="colors-8x16.svg" class="bigTall tl"/>
-    <image src="colors-8x16.svg" class="bigTall br"/>
-    <image src="colors-8x16.svg" class="bigTall tc"/>
-    <image src="colors-8x16.svg" class="bigTall cr"/>
-    <image src="colors-8x16.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.svg" class="small tr"/>
-    <image src="colors-8x16.svg" class="small bl"/>
-    <image src="colors-8x16.svg" class="small tl"/>
-    <image src="colors-8x16.svg" class="small br"/>
-    <image src="colors-8x16.svg" class="small tc"/>
-    <image src="colors-8x16.svg" class="small cr"/>
-    <image src="colors-8x16.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-svg-003-ref.html b/layout/reftests/xul/object-fit-fill-svg-003-ref.html
deleted file mode 100644
index 95ab2853d837..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-003-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-noSize.svg");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-svg-003.xul b/layout/reftests/xul/object-fit-fill-svg-003.xul
deleted file mode 100644
index 21e212e47f27..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-003.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-noSize.svg" class="bigWide tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide br"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-noSize.svg" class="bigTall tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall br"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-noSize.svg" class="small tr"/>
-    <image src="colors-16x8-noSize.svg" class="small bl"/>
-    <image src="colors-16x8-noSize.svg" class="small tl"/>
-    <image src="colors-16x8-noSize.svg" class="small br"/>
-    <image src="colors-16x8-noSize.svg" class="small tc"/>
-    <image src="colors-16x8-noSize.svg" class="small cr"/>
-    <image src="colors-16x8-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-svg-004-ref.html b/layout/reftests/xul/object-fit-fill-svg-004-ref.html
deleted file mode 100644
index 1fb40f32204e..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-004-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-noSize.svg");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-svg-004.xul b/layout/reftests/xul/object-fit-fill-svg-004.xul
deleted file mode 100644
index 49901ad166d5..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-004.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-noSize.svg" class="bigWide tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide br"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-noSize.svg" class="bigTall tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall br"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-noSize.svg" class="small tr"/>
-    <image src="colors-8x16-noSize.svg" class="small bl"/>
-    <image src="colors-8x16-noSize.svg" class="small tl"/>
-    <image src="colors-8x16-noSize.svg" class="small br"/>
-    <image src="colors-8x16-noSize.svg" class="small tc"/>
-    <image src="colors-8x16-noSize.svg" class="small cr"/>
-    <image src="colors-8x16-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-svg-005-ref.html b/layout/reftests/xul/object-fit-fill-svg-005-ref.html
deleted file mode 100644
index df1977094041..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-005-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-parDefault.svg");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-svg-005.xul b/layout/reftests/xul/object-fit-fill-svg-005.xul
deleted file mode 100644
index e38b80894b16..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-005.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-parDefault.svg" class="small tr"/>
-    <image src="colors-16x8-parDefault.svg" class="small bl"/>
-    <image src="colors-16x8-parDefault.svg" class="small tl"/>
-    <image src="colors-16x8-parDefault.svg" class="small br"/>
-    <image src="colors-16x8-parDefault.svg" class="small tc"/>
-    <image src="colors-16x8-parDefault.svg" class="small cr"/>
-    <image src="colors-16x8-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-fill-svg-006-ref.html b/layout/reftests/xul/object-fit-fill-svg-006-ref.html
deleted file mode 100644
index d1d66a32434b..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-006-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-parDefault.svg");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-fill-svg-006.xul b/layout/reftests/xul/object-fit-fill-svg-006.xul
deleted file mode 100644
index c1ee06d86956..000000000000
--- a/layout/reftests/xul/object-fit-fill-svg-006.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: fill;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-parDefault.svg" class="small tr"/>
-    <image src="colors-8x16-parDefault.svg" class="small bl"/>
-    <image src="colors-8x16-parDefault.svg" class="small tl"/>
-    <image src="colors-8x16-parDefault.svg" class="small br"/>
-    <image src="colors-8x16-parDefault.svg" class="small tc"/>
-    <image src="colors-8x16-parDefault.svg" class="small cr"/>
-    <image src="colors-8x16-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-png-001-ref.html b/layout/reftests/xul/object-fit-none-png-001-ref.html
deleted file mode 100644
index 49c08ab88f00..000000000000
--- a/layout/reftests/xul/object-fit-none-png-001-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.png");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-png-001.xul b/layout/reftests/xul/object-fit-none-png-001.xul
deleted file mode 100644
index 90c0b88f7b2b..000000000000
--- a/layout/reftests/xul/object-fit-none-png-001.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.png" class="bigWide tr"/>
-    <image src="colors-16x8.png" class="bigWide bl"/>
-    <image src="colors-16x8.png" class="bigWide tl"/>
-    <image src="colors-16x8.png" class="bigWide br"/>
-    <image src="colors-16x8.png" class="bigWide tc"/>
-    <image src="colors-16x8.png" class="bigWide cr"/>
-    <image src="colors-16x8.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.png" class="bigTall tr"/>
-    <image src="colors-16x8.png" class="bigTall bl"/>
-    <image src="colors-16x8.png" class="bigTall tl"/>
-    <image src="colors-16x8.png" class="bigTall br"/>
-    <image src="colors-16x8.png" class="bigTall tc"/>
-    <image src="colors-16x8.png" class="bigTall cr"/>
-    <image src="colors-16x8.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.png" class="small tr"/>
-    <image src="colors-16x8.png" class="small bl"/>
-    <image src="colors-16x8.png" class="small tl"/>
-    <image src="colors-16x8.png" class="small br"/>
-    <image src="colors-16x8.png" class="small tc"/>
-    <image src="colors-16x8.png" class="small cr"/>
-    <image src="colors-16x8.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-png-002-ref.html b/layout/reftests/xul/object-fit-none-png-002-ref.html
deleted file mode 100644
index 34a5fdad508e..000000000000
--- a/layout/reftests/xul/object-fit-none-png-002-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.png");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-png-002.xul b/layout/reftests/xul/object-fit-none-png-002.xul
deleted file mode 100644
index 41ba4630356e..000000000000
--- a/layout/reftests/xul/object-fit-none-png-002.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.png" class="bigWide tr"/>
-    <image src="colors-8x16.png" class="bigWide bl"/>
-    <image src="colors-8x16.png" class="bigWide tl"/>
-    <image src="colors-8x16.png" class="bigWide br"/>
-    <image src="colors-8x16.png" class="bigWide tc"/>
-    <image src="colors-8x16.png" class="bigWide cr"/>
-    <image src="colors-8x16.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.png" class="bigTall tr"/>
-    <image src="colors-8x16.png" class="bigTall bl"/>
-    <image src="colors-8x16.png" class="bigTall tl"/>
-    <image src="colors-8x16.png" class="bigTall br"/>
-    <image src="colors-8x16.png" class="bigTall tc"/>
-    <image src="colors-8x16.png" class="bigTall cr"/>
-    <image src="colors-8x16.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.png" class="small tr"/>
-    <image src="colors-8x16.png" class="small bl"/>
-    <image src="colors-8x16.png" class="small tl"/>
-    <image src="colors-8x16.png" class="small br"/>
-    <image src="colors-8x16.png" class="small tc"/>
-    <image src="colors-8x16.png" class="small cr"/>
-    <image src="colors-8x16.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-svg-001-ref.html b/layout/reftests/xul/object-fit-none-svg-001-ref.html
deleted file mode 100644
index 9022651c9b39..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-001-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-svg-001.xul b/layout/reftests/xul/object-fit-none-svg-001.xul
deleted file mode 100644
index 6fba38bd5d52..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-001.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.svg" class="bigWide tr"/>
-    <image src="colors-16x8.svg" class="bigWide bl"/>
-    <image src="colors-16x8.svg" class="bigWide tl"/>
-    <image src="colors-16x8.svg" class="bigWide br"/>
-    <image src="colors-16x8.svg" class="bigWide tc"/>
-    <image src="colors-16x8.svg" class="bigWide cr"/>
-    <image src="colors-16x8.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.svg" class="bigTall tr"/>
-    <image src="colors-16x8.svg" class="bigTall bl"/>
-    <image src="colors-16x8.svg" class="bigTall tl"/>
-    <image src="colors-16x8.svg" class="bigTall br"/>
-    <image src="colors-16x8.svg" class="bigTall tc"/>
-    <image src="colors-16x8.svg" class="bigTall cr"/>
-    <image src="colors-16x8.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.svg" class="small tr"/>
-    <image src="colors-16x8.svg" class="small bl"/>
-    <image src="colors-16x8.svg" class="small tl"/>
-    <image src="colors-16x8.svg" class="small br"/>
-    <image src="colors-16x8.svg" class="small tc"/>
-    <image src="colors-16x8.svg" class="small cr"/>
-    <image src="colors-16x8.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-svg-002-ref.html b/layout/reftests/xul/object-fit-none-svg-002-ref.html
deleted file mode 100644
index 25abf36431e1..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-002-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-svg-002.xul b/layout/reftests/xul/object-fit-none-svg-002.xul
deleted file mode 100644
index fdd7217eb0f3..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-002.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.svg" class="bigWide tr"/>
-    <image src="colors-8x16.svg" class="bigWide bl"/>
-    <image src="colors-8x16.svg" class="bigWide tl"/>
-    <image src="colors-8x16.svg" class="bigWide br"/>
-    <image src="colors-8x16.svg" class="bigWide tc"/>
-    <image src="colors-8x16.svg" class="bigWide cr"/>
-    <image src="colors-8x16.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.svg" class="bigTall tr"/>
-    <image src="colors-8x16.svg" class="bigTall bl"/>
-    <image src="colors-8x16.svg" class="bigTall tl"/>
-    <image src="colors-8x16.svg" class="bigTall br"/>
-    <image src="colors-8x16.svg" class="bigTall tc"/>
-    <image src="colors-8x16.svg" class="bigTall cr"/>
-    <image src="colors-8x16.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.svg" class="small tr"/>
-    <image src="colors-8x16.svg" class="small bl"/>
-    <image src="colors-8x16.svg" class="small tl"/>
-    <image src="colors-8x16.svg" class="small br"/>
-    <image src="colors-8x16.svg" class="small tc"/>
-    <image src="colors-8x16.svg" class="small cr"/>
-    <image src="colors-8x16.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-svg-003-ref.html b/layout/reftests/xul/object-fit-none-svg-003-ref.html
deleted file mode 100644
index 8376f997c3d6..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-003-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-noSize.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-svg-003.xul b/layout/reftests/xul/object-fit-none-svg-003.xul
deleted file mode 100644
index 031e83cad7b5..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-003.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-noSize.svg" class="bigWide tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide br"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-noSize.svg" class="bigTall tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall br"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-noSize.svg" class="small tr"/>
-    <image src="colors-16x8-noSize.svg" class="small bl"/>
-    <image src="colors-16x8-noSize.svg" class="small tl"/>
-    <image src="colors-16x8-noSize.svg" class="small br"/>
-    <image src="colors-16x8-noSize.svg" class="small tc"/>
-    <image src="colors-16x8-noSize.svg" class="small cr"/>
-    <image src="colors-16x8-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-svg-004-ref.html b/layout/reftests/xul/object-fit-none-svg-004-ref.html
deleted file mode 100644
index 86e39853af90..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-004-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-noSize.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-svg-004.xul b/layout/reftests/xul/object-fit-none-svg-004.xul
deleted file mode 100644
index 0ae5ab67d019..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-004.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-noSize.svg" class="bigWide tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide br"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-noSize.svg" class="bigTall tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall br"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-noSize.svg" class="small tr"/>
-    <image src="colors-8x16-noSize.svg" class="small bl"/>
-    <image src="colors-8x16-noSize.svg" class="small tl"/>
-    <image src="colors-8x16-noSize.svg" class="small br"/>
-    <image src="colors-8x16-noSize.svg" class="small tc"/>
-    <image src="colors-8x16-noSize.svg" class="small cr"/>
-    <image src="colors-8x16-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-svg-005-ref.html b/layout/reftests/xul/object-fit-none-svg-005-ref.html
deleted file mode 100644
index 3b8ccb3f85cb..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-005-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-parDefault.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-svg-005.xul b/layout/reftests/xul/object-fit-none-svg-005.xul
deleted file mode 100644
index 72fef0cf69d7..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-005.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-parDefault.svg" class="small tr"/>
-    <image src="colors-16x8-parDefault.svg" class="small bl"/>
-    <image src="colors-16x8-parDefault.svg" class="small tl"/>
-    <image src="colors-16x8-parDefault.svg" class="small br"/>
-    <image src="colors-16x8-parDefault.svg" class="small tc"/>
-    <image src="colors-16x8-parDefault.svg" class="small cr"/>
-    <image src="colors-16x8-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-none-svg-006-ref.html b/layout/reftests/xul/object-fit-none-svg-006-ref.html
deleted file mode 100644
index 1a78e8c8ef07..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-006-ref.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-parDefault.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-none-svg-006.xul b/layout/reftests/xul/object-fit-none-svg-006.xul
deleted file mode 100644
index 5902fc0f7340..000000000000
--- a/layout/reftests/xul/object-fit-none-svg-006.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: none;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-parDefault.svg" class="small tr"/>
-    <image src="colors-8x16-parDefault.svg" class="small bl"/>
-    <image src="colors-8x16-parDefault.svg" class="small tl"/>
-    <image src="colors-8x16-parDefault.svg" class="small br"/>
-    <image src="colors-8x16-parDefault.svg" class="small tc"/>
-    <image src="colors-8x16-parDefault.svg" class="small cr"/>
-    <image src="colors-8x16-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-png-001-ref.html b/layout/reftests/xul/object-fit-scale-down-png-001-ref.html
deleted file mode 100644
index 58c0abacd399..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-png-001-ref.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.png");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-png-001.xul b/layout/reftests/xul/object-fit-scale-down-png-001.xul
deleted file mode 100644
index 283b35d32987..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-png-001.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.png" class="bigWide tr"/>
-    <image src="colors-16x8.png" class="bigWide bl"/>
-    <image src="colors-16x8.png" class="bigWide tl"/>
-    <image src="colors-16x8.png" class="bigWide br"/>
-    <image src="colors-16x8.png" class="bigWide tc"/>
-    <image src="colors-16x8.png" class="bigWide cr"/>
-    <image src="colors-16x8.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.png" class="bigTall tr"/>
-    <image src="colors-16x8.png" class="bigTall bl"/>
-    <image src="colors-16x8.png" class="bigTall tl"/>
-    <image src="colors-16x8.png" class="bigTall br"/>
-    <image src="colors-16x8.png" class="bigTall tc"/>
-    <image src="colors-16x8.png" class="bigTall cr"/>
-    <image src="colors-16x8.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.png" class="small tr"/>
-    <image src="colors-16x8.png" class="small bl"/>
-    <image src="colors-16x8.png" class="small tl"/>
-    <image src="colors-16x8.png" class="small br"/>
-    <image src="colors-16x8.png" class="small tc"/>
-    <image src="colors-16x8.png" class="small cr"/>
-    <image src="colors-16x8.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-png-002-ref.html b/layout/reftests/xul/object-fit-scale-down-png-002-ref.html
deleted file mode 100644
index 1a554b7da83c..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-png-002-ref.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.png");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-        image-rendering: -moz-crisp-edges;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-png-002.xul b/layout/reftests/xul/object-fit-scale-down-png-002.xul
deleted file mode 100644
index 828890c575c0..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-png-002.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        image-rendering: -moz-crisp-edges;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.png" class="bigWide tr"/>
-    <image src="colors-8x16.png" class="bigWide bl"/>
-    <image src="colors-8x16.png" class="bigWide tl"/>
-    <image src="colors-8x16.png" class="bigWide br"/>
-    <image src="colors-8x16.png" class="bigWide tc"/>
-    <image src="colors-8x16.png" class="bigWide cr"/>
-    <image src="colors-8x16.png" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.png" class="bigTall tr"/>
-    <image src="colors-8x16.png" class="bigTall bl"/>
-    <image src="colors-8x16.png" class="bigTall tl"/>
-    <image src="colors-8x16.png" class="bigTall br"/>
-    <image src="colors-8x16.png" class="bigTall tc"/>
-    <image src="colors-8x16.png" class="bigTall cr"/>
-    <image src="colors-8x16.png" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.png" class="small tr"/>
-    <image src="colors-8x16.png" class="small bl"/>
-    <image src="colors-8x16.png" class="small tl"/>
-    <image src="colors-8x16.png" class="small br"/>
-    <image src="colors-8x16.png" class="small tc"/>
-    <image src="colors-8x16.png" class="small cr"/>
-    <image src="colors-8x16.png" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-001-ref.html b/layout/reftests/xul/object-fit-scale-down-svg-001-ref.html
deleted file mode 100644
index 7930af730104..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-001-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-001.xul b/layout/reftests/xul/object-fit-scale-down-svg-001.xul
deleted file mode 100644
index c78ecc63ec40..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-001.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8.svg" class="bigWide tr"/>
-    <image src="colors-16x8.svg" class="bigWide bl"/>
-    <image src="colors-16x8.svg" class="bigWide tl"/>
-    <image src="colors-16x8.svg" class="bigWide br"/>
-    <image src="colors-16x8.svg" class="bigWide tc"/>
-    <image src="colors-16x8.svg" class="bigWide cr"/>
-    <image src="colors-16x8.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8.svg" class="bigTall tr"/>
-    <image src="colors-16x8.svg" class="bigTall bl"/>
-    <image src="colors-16x8.svg" class="bigTall tl"/>
-    <image src="colors-16x8.svg" class="bigTall br"/>
-    <image src="colors-16x8.svg" class="bigTall tc"/>
-    <image src="colors-16x8.svg" class="bigTall cr"/>
-    <image src="colors-16x8.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8.svg" class="small tr"/>
-    <image src="colors-16x8.svg" class="small bl"/>
-    <image src="colors-16x8.svg" class="small tl"/>
-    <image src="colors-16x8.svg" class="small br"/>
-    <image src="colors-16x8.svg" class="small tc"/>
-    <image src="colors-16x8.svg" class="small cr"/>
-    <image src="colors-16x8.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-002-ref.html b/layout/reftests/xul/object-fit-scale-down-svg-002-ref.html
deleted file mode 100644
index ffba4c042661..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-002-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-002.xul b/layout/reftests/xul/object-fit-scale-down-svg-002.xul
deleted file mode 100644
index 725d7e375e2d..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-002.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16.svg" class="bigWide tr"/>
-    <image src="colors-8x16.svg" class="bigWide bl"/>
-    <image src="colors-8x16.svg" class="bigWide tl"/>
-    <image src="colors-8x16.svg" class="bigWide br"/>
-    <image src="colors-8x16.svg" class="bigWide tc"/>
-    <image src="colors-8x16.svg" class="bigWide cr"/>
-    <image src="colors-8x16.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16.svg" class="bigTall tr"/>
-    <image src="colors-8x16.svg" class="bigTall bl"/>
-    <image src="colors-8x16.svg" class="bigTall tl"/>
-    <image src="colors-8x16.svg" class="bigTall br"/>
-    <image src="colors-8x16.svg" class="bigTall tc"/>
-    <image src="colors-8x16.svg" class="bigTall cr"/>
-    <image src="colors-8x16.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16.svg" class="small tr"/>
-    <image src="colors-8x16.svg" class="small bl"/>
-    <image src="colors-8x16.svg" class="small tl"/>
-    <image src="colors-8x16.svg" class="small br"/>
-    <image src="colors-8x16.svg" class="small tc"/>
-    <image src="colors-8x16.svg" class="small cr"/>
-    <image src="colors-8x16.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-003-ref.html b/layout/reftests/xul/object-fit-scale-down-svg-003-ref.html
deleted file mode 100644
index 2a7ba611e7be..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-003-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-noSize.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-003.xul b/layout/reftests/xul/object-fit-scale-down-svg-003.xul
deleted file mode 100644
index 193d41be0843..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-003.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-noSize.svg" class="bigWide tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide br"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-noSize.svg" class="bigTall tr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall bl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tl"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall br"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall tc"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall cr"/>
-    <image src="colors-16x8-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-noSize.svg" class="small tr"/>
-    <image src="colors-16x8-noSize.svg" class="small bl"/>
-    <image src="colors-16x8-noSize.svg" class="small tl"/>
-    <image src="colors-16x8-noSize.svg" class="small br"/>
-    <image src="colors-16x8-noSize.svg" class="small tc"/>
-    <image src="colors-16x8-noSize.svg" class="small cr"/>
-    <image src="colors-16x8-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-004-ref.html b/layout/reftests/xul/object-fit-scale-down-svg-004-ref.html
deleted file mode 100644
index b4b07a55c516..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-004-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-noSize.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-004.xul b/layout/reftests/xul/object-fit-scale-down-svg-004.xul
deleted file mode 100644
index 091be4bd2d48..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-004.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-noSize.svg" class="bigWide tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide br"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-noSize.svg" class="bigTall tr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall bl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tl"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall br"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall tc"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall cr"/>
-    <image src="colors-8x16-noSize.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-noSize.svg" class="small tr"/>
-    <image src="colors-8x16-noSize.svg" class="small bl"/>
-    <image src="colors-8x16-noSize.svg" class="small tl"/>
-    <image src="colors-8x16-noSize.svg" class="small br"/>
-    <image src="colors-8x16-noSize.svg" class="small tc"/>
-    <image src="colors-8x16-noSize.svg" class="small cr"/>
-    <image src="colors-8x16-noSize.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-005-ref.html b/layout/reftests/xul/object-fit-scale-down-svg-005-ref.html
deleted file mode 100644
index bac7f3db1170..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-005-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-16x8-parDefault.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-005.xul b/layout/reftests/xul/object-fit-scale-down-svg-005.xul
deleted file mode 100644
index 2d6a9e743ce3..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-005.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-16x8-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-16x8-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall br"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-16x8-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-16x8-parDefault.svg" class="small tr"/>
-    <image src="colors-16x8-parDefault.svg" class="small bl"/>
-    <image src="colors-16x8-parDefault.svg" class="small tl"/>
-    <image src="colors-16x8-parDefault.svg" class="small br"/>
-    <image src="colors-16x8-parDefault.svg" class="small tc"/>
-    <image src="colors-16x8-parDefault.svg" class="small cr"/>
-    <image src="colors-16x8-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-006-ref.html b/layout/reftests/xul/object-fit-scale-down-svg-006-ref.html
deleted file mode 100644
index 30097222bd31..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-006-ref.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      .objectOuter {
-        border: 1px dashed gray;
-        padding: 1px;
-        float: left;
-      }
-      .objectOuter > * {
-        background-image: url("colors-8x16-parDefault.svg");
-        background-size: auto auto;
-        background-repeat: no-repeat;
-      }
-      .objectOuter > .small { background-size: contain; }
-      .bigWide {
-        width: 48px;
-        height: 32px;
-      }
-      .bigTall {
-        width: 32px;
-        height: 48px;
-      }
-      .small {
-        width: 8px;
-        height: 8px;
-      }
-
-      br { clear: both; }
-
-      .tr { background-position: top right }
-      .bl { background-position: bottom left }
-      .tl { background-position: top 25% left 25% }
-      .br { background-position: bottom 1px right 2px }
-
-      .tc { background-position: top 3px center }
-      .cr { background-position: center right 25% }
-      .default { background-position: 50% 50% }
-    </style>
-  </head>
-  <body>
-    <!-- big/wide: -->
-    <div class="objectOuter"><div class="bigWide tr"></div></div>
-    <div class="objectOuter"><div class="bigWide bl"></div></div>
-    <div class="objectOuter"><div class="bigWide tl"></div></div>
-    <div class="objectOuter"><div class="bigWide br"></div></div>
-    <div class="objectOuter"><div class="bigWide tc"></div></div>
-    <div class="objectOuter"><div class="bigWide cr"></div></div>
-    <div class="objectOuter"><div class="bigWide default"></div></div>
-    <br>
-    <!-- big/tall: -->
-    <div class="objectOuter"><div class="bigTall tr"></div></div>
-    <div class="objectOuter"><div class="bigTall bl"></div></div>
-    <div class="objectOuter"><div class="bigTall tl"></div></div>
-    <div class="objectOuter"><div class="bigTall br"></div></div>
-    <div class="objectOuter"><div class="bigTall tc"></div></div>
-    <div class="objectOuter"><div class="bigTall cr"></div></div>
-    <div class="objectOuter"><div class="bigTall default"></div></div>
-    <br>
-    <!-- small: -->
-    <div class="objectOuter"><div class="small tr"></div></div>
-    <div class="objectOuter"><div class="small bl"></div></div>
-    <div class="objectOuter"><div class="small tl"></div></div>
-    <div class="objectOuter"><div class="small br"></div></div>
-    <div class="objectOuter"><div class="small tc"></div></div>
-    <div class="objectOuter"><div class="small cr"></div></div>
-    <div class="objectOuter"><div class="small default"></div></div>
-    <br>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-fit-scale-down-svg-006.xul b/layout/reftests/xul/object-fit-scale-down-svg-006.xul
deleted file mode 100644
index 645498a984a9..000000000000
--- a/layout/reftests/xul/object-fit-scale-down-svg-006.xul
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        border: 1px dashed gray;
-        padding: 1px;
-        object-fit: scale-down;
-        float: left;
-      }
-
-      .bigWide {
-        width: 52px;
-        height: 36px;
-      }
-      .bigTall {
-        width: 36px;
-        height: 52px;
-      }
-      .small {
-        width: 12px;
-        height: 12px;
-      }
-
-      br { clear: both; }
-
-      .tr { object-position: top right }
-      .bl { object-position: bottom left }
-      .tl { object-position: top 25% left 25% }
-      .br { object-position: bottom 1px right 2px }
-
-      .tc { object-position: top 3px center }
-      .cr { object-position: center right 25% }
-  ]]></style>
-  <hbox>
-    <!-- big/wide: -->
-    <image src="colors-8x16-parDefault.svg" class="bigWide tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigWide"/>
-  </hbox>
-  <hbox>
-    <!-- big/tall: -->
-    <image src="colors-8x16-parDefault.svg" class="bigTall tr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall bl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tl"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall br"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall tc"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall cr"/>
-    <image src="colors-8x16-parDefault.svg" class="bigTall"/>
-  </hbox>
-  <hbox>
-    <!-- small: -->
-    <image src="colors-8x16-parDefault.svg" class="small tr"/>
-    <image src="colors-8x16-parDefault.svg" class="small bl"/>
-    <image src="colors-8x16-parDefault.svg" class="small tl"/>
-    <image src="colors-8x16-parDefault.svg" class="small br"/>
-    <image src="colors-8x16-parDefault.svg" class="small tc"/>
-    <image src="colors-8x16-parDefault.svg" class="small cr"/>
-    <image src="colors-8x16-parDefault.svg" class="small"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-position-png-001-ref.html b/layout/reftests/xul/object-position-png-001-ref.html
deleted file mode 100644
index 4a1267a4fd23..000000000000
--- a/layout/reftests/xul/object-position-png-001-ref.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      div {
-        background: lightgray;
-        margin-right: 2px;
-        background-image: url("colors-16x8.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-        float: left;
-        width: 20px;
-        height: 20px;
-      }
-
-      .op_y-7  { background-position: 50%  -7% }
-      .op_y13  { background-position: 50%  13% }
-      .op_y23  { background-position: 50%  23% }
-      .op_y50  { background-position: 50%  50% }
-      .op_y75  { background-position: 50%  75% }
-      .op_y88  { background-position: 50%  88% }
-      .op_y111 { background-position: 50% 111% }
-
-    </style>
-  </head>
-  <body>
-    <div class="op_y-7"></div>
-    <div class="op_y13"></div>
-    <div class="op_y23"></div>
-    <div class="op_y50"></div>
-    <div class="op_y75"></div>
-    <div class="op_y88"></div>
-    <div class="op_y111"></div>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-position-png-001.xul b/layout/reftests/xul/object-position-png-001.xul
deleted file mode 100644
index e216dc84978e..000000000000
--- a/layout/reftests/xul/object-position-png-001.xul
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        background: lightgray;
-        margin-right: 2px;
-        object-fit: contain;
-        float: left;
-        width: 20px;
-        height: 20px;
-      }
-
-      .op_y-7  { object-position: 50%  -7% }
-      .op_y13  { object-position: 50%  13% }
-      .op_y23  { object-position: 50%  23% }
-      .op_y50  { object-position: 50%  50% }
-      .op_y75  { object-position: 50%  75% }
-      .op_y88  { object-position: 50%  88% }
-      .op_y111 { object-position: 50% 111% }
-
-  ]]></style>
-  <hbox>
-    <image src="colors-16x8.png" class="op_y-7"/>
-    <image src="colors-16x8.png" class="op_y13"/>
-    <image src="colors-16x8.png" class="op_y23"/>
-    <image src="colors-16x8.png" class="op_y50"/>
-    <image src="colors-16x8.png" class="op_y75"/>
-    <image src="colors-16x8.png" class="op_y88"/>
-    <image src="colors-16x8.png" class="op_y111"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/object-position-png-002-ref.html b/layout/reftests/xul/object-position-png-002-ref.html
deleted file mode 100644
index 8c687d3e9bf0..000000000000
--- a/layout/reftests/xul/object-position-png-002-ref.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style type="text/css">
-      div {
-        background: lightgray;
-        margin-right: 2px;
-        background-image: url("colors-8x16.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-        float: left;
-        width: 20px;
-        height: 20px;
-      }
-
-      .op_x-7  { background-position:  -7% 50% }
-      .op_x13  { background-position:  13% 50% }
-      .op_x23  { background-position:  23% 50% }
-      .op_x50  { background-position:  50% 50% }
-      .op_x75  { background-position:  75% 50% }
-      .op_x88  { background-position:  88% 50% }
-      .op_x111 { background-position: 111% 50% }
-
-    </style>
-  </head>
-  <body>
-    <div class="op_x-7"></div>
-    <div class="op_x13"></div>
-    <div class="op_x23"></div>
-    <div class="op_x50"></div>
-    <div class="op_x75"></div>
-    <div class="op_x88"></div>
-    <div class="op_x111"></div>
-  </body>
-</html>
diff --git a/layout/reftests/xul/object-position-png-002.xul b/layout/reftests/xul/object-position-png-002.xul
deleted file mode 100644
index 62a2035b387b..000000000000
--- a/layout/reftests/xul/object-position-png-002.xul
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-      window { padding: 8px; }
-      image {
-        background: lightgray;
-        margin-right: 2px;
-        object-fit: contain;
-        float: left;
-        width: 20px;
-        height: 20px;
-      }
-
-      .op_x-7  { object-position: -7%  50% }
-      .op_x13  { object-position: 13%  50% }
-      .op_x23  { object-position: 23%  50% }
-      .op_x50  { object-position: 50%  50% }
-      .op_x75  { object-position: 75%  50% }
-      .op_x88  { object-position: 88%  50% }
-      .op_x111 { object-position: 111% 50% }
-
-  ]]></style>
-  <hbox>
-    <image src="colors-8x16.png" class="op_x-7"/>
-    <image src="colors-8x16.png" class="op_x13"/>
-    <image src="colors-8x16.png" class="op_x23"/>
-    <image src="colors-8x16.png" class="op_x50"/>
-    <image src="colors-8x16.png" class="op_x75"/>
-    <image src="colors-8x16.png" class="op_x88"/>
-    <image src="colors-8x16.png" class="op_x111"/>
-  </hbox>
-</window>
diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list
index 192e0cbf0844..93e463eb4c32 100644
--- a/layout/reftests/xul/reftest.list
+++ b/layout/reftests/xul/reftest.list
@@ -8,51 +8,3 @@ skip-if(cocoaWidget) skip-if((B2G&&browserIsRemote)||Mulet) == accesskey.xul acc
 fails-if(cocoaWidget) skip-if((B2G&&browserIsRemote)||Mulet) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if((B2G&&browserIsRemote)||Mulet) != tree-row-outline-1.xul tree-row-outline-1-notref.xul # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if((B2G&&browserIsRemote)||Mulet) == text-small-caps-1.xul text-small-caps-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
-
-# Tests for XUL <image> with 'object-fit' & 'object-position':
-# These tests should be very similar to tests in our w3c-css/submitted/images3
-# reftest directory. They live here because they use XUL, and it
-# wouldn't be fair of us to make a W3C testsuite implicitly depend on XUL.
-default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)
-== object-fit-contain-png-001.xul object-fit-contain-png-001-ref.html
-== object-fit-contain-png-002.xul object-fit-contain-png-002-ref.html
-== object-fit-contain-svg-001.xul object-fit-contain-svg-001-ref.html
-== object-fit-contain-svg-002.xul object-fit-contain-svg-002-ref.html
-== object-fit-contain-svg-003.xul object-fit-contain-svg-003-ref.html
-== object-fit-contain-svg-004.xul object-fit-contain-svg-004-ref.html
-== object-fit-contain-svg-005.xul object-fit-contain-svg-005-ref.html
-== object-fit-contain-svg-006.xul object-fit-contain-svg-006-ref.html
-== object-fit-cover-png-001.xul object-fit-cover-png-001-ref.html
-== object-fit-cover-png-002.xul object-fit-cover-png-002-ref.html
-== object-fit-cover-svg-001.xul object-fit-cover-svg-001-ref.html
-== object-fit-cover-svg-002.xul object-fit-cover-svg-002-ref.html
-== object-fit-cover-svg-003.xul object-fit-cover-svg-003-ref.html
-== object-fit-cover-svg-004.xul object-fit-cover-svg-004-ref.html
-== object-fit-cover-svg-005.xul object-fit-cover-svg-005-ref.html
-== object-fit-cover-svg-006.xul object-fit-cover-svg-006-ref.html
-== object-fit-fill-png-001.xul object-fit-fill-png-001-ref.html
-== object-fit-fill-png-002.xul object-fit-fill-png-002-ref.html
-== object-fit-fill-svg-001.xul object-fit-fill-svg-001-ref.html
-== object-fit-fill-svg-002.xul object-fit-fill-svg-002-ref.html
-== object-fit-fill-svg-003.xul object-fit-fill-svg-003-ref.html
-== object-fit-fill-svg-004.xul object-fit-fill-svg-004-ref.html
-fails == object-fit-fill-svg-005.xul object-fit-fill-svg-005-ref.html # bug 1092436
-fails == object-fit-fill-svg-006.xul object-fit-fill-svg-006-ref.html # bug 1092436
-== object-fit-none-png-001.xul object-fit-none-png-001-ref.html
-== object-fit-none-png-002.xul object-fit-none-png-002-ref.html
-== object-fit-none-svg-001.xul object-fit-none-svg-001-ref.html
-== object-fit-none-svg-002.xul object-fit-none-svg-002-ref.html
-== object-fit-none-svg-003.xul object-fit-none-svg-003-ref.html
-== object-fit-none-svg-004.xul object-fit-none-svg-004-ref.html
-== object-fit-none-svg-005.xul object-fit-none-svg-005-ref.html
-== object-fit-none-svg-006.xul object-fit-none-svg-006-ref.html
-== object-fit-scale-down-png-001.xul object-fit-scale-down-png-001-ref.html
-== object-fit-scale-down-png-002.xul object-fit-scale-down-png-002-ref.html
-== object-fit-scale-down-svg-001.xul object-fit-scale-down-svg-001-ref.html
-== object-fit-scale-down-svg-002.xul object-fit-scale-down-svg-002-ref.html
-== object-fit-scale-down-svg-003.xul object-fit-scale-down-svg-003-ref.html
-== object-fit-scale-down-svg-004.xul object-fit-scale-down-svg-004-ref.html
-== object-fit-scale-down-svg-005.xul object-fit-scale-down-svg-005-ref.html
-== object-fit-scale-down-svg-006.xul object-fit-scale-down-svg-006-ref.html
-== object-position-png-001.xul object-position-png-001-ref.html
-== object-position-png-002.xul object-position-png-002-ref.html
diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp
index f830ed6acc53..bac3bee8b9ea 100644
--- a/layout/xul/nsImageBoxFrame.cpp
+++ b/layout/xul/nsImageBoxFrame.cpp
@@ -15,7 +15,6 @@
 #include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsStyleUtil.h"
 #include "nsCOMPtr.h"
 #include "nsPresContext.h"
 #include "nsBoxLayoutState.h"
@@ -52,7 +51,6 @@
 
 #include "mozilla/BasicEvents.h"
 #include "mozilla/EventDispatcher.h"
-#include "mozilla/Maybe.h"
 
 #define ONLOAD_CALLED_TOO_EARLY 1
 
@@ -309,13 +307,6 @@ nsImageBoxFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   if (!IsVisibleForPainting(aBuilder))
     return;
 
-  uint32_t clipFlags =
-    nsStyleUtil::ObjectPropsMightCauseOverflow(StylePosition()) ?
-    0 : DisplayListClipState::ASSUME_DRAWING_RESTRICTED_TO_CONTENT_RECT;
-
-  DisplayListClipState::AutoClipContainingBlockDescendantsToContentBox
-    clip(aBuilder, this, clipFlags);
-
   nsDisplayList list;
   list.AppendNewToTop(
     new (aBuilder) nsDisplayXULImage(aBuilder, this));
@@ -330,10 +321,10 @@ nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext,
                             const nsRect& aDirtyRect, nsPoint aPt,
                             uint32_t aFlags)
 {
-  nsRect constraintRect;
-  GetClientRect(constraintRect);
+  nsRect rect;
+  GetClientRect(rect);
 
-  constraintRect += aPt;
+  rect += aPt;
 
   if (!mImageRequest) {
     // This probably means we're drawn by a native theme.
@@ -343,60 +334,24 @@ nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext,
   // don't draw if the image is not dirty
   // XXX(seth): Can this actually happen anymore?
   nsRect dirty;
-  if (!dirty.IntersectRect(aDirtyRect, constraintRect)) {
+  if (!dirty.IntersectRect(aDirtyRect, rect)) {
     return DrawResult::TEMPORARY_ERROR;
   }
 
   nsCOMPtr<imgIContainer> imgCon;
   mImageRequest->GetImage(getter_AddRefs(imgCon));
 
-  if (!imgCon) {
-    return DrawResult::NOT_READY;
+  if (imgCon) {
+    bool hasSubRect = !mUseSrcAttr && (mSubRect.width > 0 || mSubRect.height > 0);
+    return
+      nsLayoutUtils::DrawSingleImage(*aRenderingContext.ThebesContext(),
+        PresContext(), imgCon,
+        nsLayoutUtils::GetGraphicsFilterForFrame(this),
+        rect, dirty, nullptr, aFlags, nullptr,
+        hasSubRect ? &mSubRect : nullptr);
   }
 
-  bool hasSubRect = !mUseSrcAttr && (mSubRect.width > 0 || mSubRect.height > 0);
-
-  Maybe<nsPoint> anchorPoint;
-  nsRect dest;
-  if (!mUseSrcAttr) {
-    // Our image (if we have one) is coming from the CSS property
-    // 'list-style-image' (combined with '-moz-image-region'). For now, ignore
-    // 'object-fit' & 'object-position' in this case, and just fill our rect.
-    // XXXdholbert Should we even honor these properties in this case? They only
-    // apply to replaced elements, and I'm not sure we count as a replaced
-    // element when our image data is determined by CSS.
-    dest = constraintRect;
-  } else {
-    // Determine dest rect based on intrinsic size & ratio, along with
-    // 'object-fit' & 'object-position' properties:
-    IntrinsicSize intrinsicSize;
-    nsSize intrinsicRatio;
-    if (mIntrinsicSize.width > 0 && mIntrinsicSize.height > 0) {
-      // Image has a valid size; use it as intrinsic size & ratio.
-      intrinsicSize.width.SetCoordValue(mIntrinsicSize.width);
-      intrinsicSize.height.SetCoordValue(mIntrinsicSize.height);
-      intrinsicRatio = mIntrinsicSize;
-    } else {
-      // Image doesn't have a (valid) intrinsic size.
-      // Try to look up intrinsic ratio and use that at least.
-      imgCon->GetIntrinsicRatio(&intrinsicRatio);
-    }
-    anchorPoint.emplace();
-    dest = nsLayoutUtils::ComputeObjectDestRect(constraintRect,
-                                                intrinsicSize,
-                                                intrinsicRatio,
-                                                StylePosition(),
-                                                anchorPoint.ptr());
-  }
-
-
-  return nsLayoutUtils::DrawSingleImage(
-           *aRenderingContext.ThebesContext(),
-           PresContext(), imgCon,
-           nsLayoutUtils::GetGraphicsFilterForFrame(this),
-           dest, dirty, nullptr, aFlags,
-           anchorPoint.ptrOr(nullptr),
-           hasSubRect ? &mSubRect : nullptr);
+  return DrawResult::NOT_READY;
 }
 
 void nsDisplayXULImage::Paint(nsDisplayListBuilder* aBuilder,