Rename (renumber) new mozilla-central-reftests shapes1 tests to avoid filename collisions with existing tests. Followup to bug 1311244, bug 1326406, and bug 1326407.
authorL. David Baron <dbaron@dbaron.org>
Fri, 03 Mar 2017 09:15:54 -0800
changeset 374850 6dfad3d738fed02f68223568f8ceb43df5a4e575
parent 374849 ec25e01a8ff15b728175f52cdc841129a7e1e8d6
child 374851 6bd0aa101e17792acc0c5094d195a48d4fc20a37
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1311244, 1326406, 1326407
milestone54.0a1
Rename (renumber) new mozilla-central-reftests shapes1 tests to avoid filename collisions with existing tests. Followup to bug 1311244, bug 1326406, and bug 1326407. Fixes https://github.com/w3c/csswg-test/issues/1227 . This patch was written with the script: #!/bin/bash cd "$(dirname "$0")/shapes1" echo "circle 31 ellipse 31 inset 15" | while read BASE INCREMENT do echo shape-outside-$BASE-* | sed 's/ /\n/g;' | sed 's/\([0-9]\{3\}\)/ \1 /' | while read FILESTART OLDNUM FILEEND do NEWNUM=$(printf "%03d" $(($(echo $OLDNUM | sed 's/^0*//') + $INCREMENT))) OLDFILE="$FILESTART$OLDNUM$FILEEND" NEWFILE="$FILESTART$NEWNUM$FILEEND" hg mv "$OLDFILE" "$NEWFILE" sed -i -e "s/$OLDFILE/$NEWFILE/g" * done done
layout/reftests/w3c-css/submitted/shapes1/reftest.list
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-001-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-001.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-002-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-002.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-003-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-003.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-004-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-004.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-005-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-005.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-006.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-007.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-008-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-008.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-009.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-010-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-010.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-011-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-011.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-012.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-013.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-014-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-014.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-015.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-016-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-016.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-017-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-017.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-018-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-018.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-019-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-019.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-020-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-020.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-021-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-021.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-022-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-022.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-023-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-023.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-024-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-024.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-032-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-032.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-033-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-033.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-034-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-034.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-035-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-035.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-036-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-036.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-037.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-038.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-040.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-041-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-041.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-042-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-042.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-043.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-044.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-046.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-047-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-047.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-048-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-048.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-049-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-049.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-050-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-050.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-051-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-051.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-052-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-052.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-053-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-053.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-054-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-054.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-055-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-055.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-001-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-001.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-002-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-002.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-003-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-003.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-004-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-004.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-005-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-005.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-006-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-006.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-007-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-007.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-008-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-008.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-009-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-009.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-010.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-011-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-011.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-012.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-013-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-013.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-014-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-014.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-015-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-015.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-016-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-016.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-017-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-017.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-018-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-018.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-019-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-019.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-020-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-020.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-041.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-043.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-001-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-001.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-002-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-002.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-003-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-003.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-004-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-004.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-005-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-005.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-006-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-006.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-007-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-007.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-008-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-008.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-009-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-009.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-010-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-010.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-011-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-011.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-012-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-012.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-016-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-016.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-017-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-017.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-020-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-020.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-021-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-021.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-022-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-022.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-023-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-023.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-024-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-024.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-025-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-025.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-026-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-026.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-027-ref.html
layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-027.html
--- a/layout/reftests/w3c-css/submitted/shapes1/reftest.list
+++ b/layout/reftests/w3c-css/submitted/shapes1/reftest.list
@@ -32,68 +32,68 @@ fails == shape-outside-border-box-border
 == shape-outside-border-box-border-radius-011.html shape-outside-border-box-border-radius-011-ref.html
 == shape-outside-border-box-border-radius-012.html shape-outside-border-box-border-radius-012-ref.html
 == shape-outside-padding-box-border-radius-001.html shape-outside-padding-box-border-radius-001-ref.html
 == shape-outside-padding-box-border-radius-002.html shape-outside-padding-box-border-radius-002-ref.html
 == shape-outside-content-box-border-radius-001.html shape-outside-content-box-border-radius-001-ref.html
 == shape-outside-content-box-border-radius-002.html shape-outside-content-box-border-radius-002-ref.html
 
 # Basic shape: circle()
-== shape-outside-circle-001.html shape-outside-circle-001-ref.html
-== shape-outside-circle-002.html shape-outside-circle-002-ref.html
-== shape-outside-circle-003.html shape-outside-circle-003-ref.html
-== shape-outside-circle-004.html shape-outside-circle-004-ref.html
-== shape-outside-circle-005.html shape-outside-circle-005-ref.html
-== shape-outside-circle-006.html shape-outside-circle-005-ref.html
-== shape-outside-circle-007.html shape-outside-circle-005-ref.html
-== shape-outside-circle-008.html shape-outside-circle-008-ref.html
-== shape-outside-circle-009.html shape-outside-circle-008-ref.html
-== shape-outside-circle-010.html shape-outside-circle-010-ref.html
-== shape-outside-circle-011.html shape-outside-circle-011-ref.html
-== shape-outside-circle-012.html shape-outside-circle-011-ref.html
-== shape-outside-circle-013.html shape-outside-circle-011-ref.html
-== shape-outside-circle-014.html shape-outside-circle-014-ref.html
-== shape-outside-circle-015.html shape-outside-circle-014-ref.html
-== shape-outside-circle-016.html shape-outside-circle-016-ref.html
-== shape-outside-circle-017.html shape-outside-circle-017-ref.html
-== shape-outside-circle-018.html shape-outside-circle-018-ref.html
-== shape-outside-circle-019.html shape-outside-circle-019-ref.html
-== shape-outside-circle-020.html shape-outside-circle-020-ref.html
-== shape-outside-circle-021.html shape-outside-circle-021-ref.html
-== shape-outside-circle-022.html shape-outside-circle-022-ref.html
-== shape-outside-circle-023.html shape-outside-circle-023-ref.html
-== shape-outside-circle-024.html shape-outside-circle-024-ref.html
+== shape-outside-circle-032.html shape-outside-circle-032-ref.html
+== shape-outside-circle-033.html shape-outside-circle-033-ref.html
+== shape-outside-circle-034.html shape-outside-circle-034-ref.html
+== shape-outside-circle-035.html shape-outside-circle-035-ref.html
+== shape-outside-circle-036.html shape-outside-circle-036-ref.html
+== shape-outside-circle-037.html shape-outside-circle-036-ref.html
+== shape-outside-circle-038.html shape-outside-circle-036-ref.html
+== shape-outside-circle-039.html shape-outside-circle-039-ref.html
+== shape-outside-circle-040.html shape-outside-circle-039-ref.html
+== shape-outside-circle-041.html shape-outside-circle-041-ref.html
+== shape-outside-circle-042.html shape-outside-circle-042-ref.html
+== shape-outside-circle-043.html shape-outside-circle-042-ref.html
+== shape-outside-circle-044.html shape-outside-circle-042-ref.html
+== shape-outside-circle-045.html shape-outside-circle-045-ref.html
+== shape-outside-circle-046.html shape-outside-circle-045-ref.html
+== shape-outside-circle-047.html shape-outside-circle-047-ref.html
+== shape-outside-circle-048.html shape-outside-circle-048-ref.html
+== shape-outside-circle-049.html shape-outside-circle-049-ref.html
+== shape-outside-circle-050.html shape-outside-circle-050-ref.html
+== shape-outside-circle-051.html shape-outside-circle-051-ref.html
+== shape-outside-circle-052.html shape-outside-circle-052-ref.html
+== shape-outside-circle-053.html shape-outside-circle-053-ref.html
+== shape-outside-circle-054.html shape-outside-circle-054-ref.html
+== shape-outside-circle-055.html shape-outside-circle-055-ref.html
 
 # Basic shape: ellipse()
-== shape-outside-ellipse-001.html shape-outside-ellipse-001-ref.html
-== shape-outside-ellipse-002.html shape-outside-ellipse-002-ref.html
-== shape-outside-ellipse-003.html shape-outside-ellipse-003-ref.html
-== shape-outside-ellipse-004.html shape-outside-ellipse-004-ref.html
-== shape-outside-ellipse-005.html shape-outside-ellipse-005-ref.html
-== shape-outside-ellipse-006.html shape-outside-ellipse-006-ref.html
-== shape-outside-ellipse-007.html shape-outside-ellipse-007-ref.html
-== shape-outside-ellipse-008.html shape-outside-ellipse-008-ref.html
-== shape-outside-ellipse-009.html shape-outside-ellipse-009-ref.html
-== shape-outside-ellipse-010.html shape-outside-ellipse-009-ref.html
-== shape-outside-ellipse-011.html shape-outside-ellipse-011-ref.html
-== shape-outside-ellipse-012.html shape-outside-ellipse-011-ref.html
-== shape-outside-ellipse-013.html shape-outside-ellipse-013-ref.html
-== shape-outside-ellipse-014.html shape-outside-ellipse-014-ref.html
-== shape-outside-ellipse-015.html shape-outside-ellipse-015-ref.html
-== shape-outside-ellipse-016.html shape-outside-ellipse-016-ref.html
-== shape-outside-ellipse-017.html shape-outside-ellipse-017-ref.html
-== shape-outside-ellipse-018.html shape-outside-ellipse-018-ref.html
-== shape-outside-ellipse-019.html shape-outside-ellipse-019-ref.html
-== shape-outside-ellipse-020.html shape-outside-ellipse-020-ref.html
+== shape-outside-ellipse-032.html shape-outside-ellipse-032-ref.html
+== shape-outside-ellipse-033.html shape-outside-ellipse-033-ref.html
+== shape-outside-ellipse-034.html shape-outside-ellipse-034-ref.html
+== shape-outside-ellipse-035.html shape-outside-ellipse-035-ref.html
+== shape-outside-ellipse-036.html shape-outside-ellipse-036-ref.html
+== shape-outside-ellipse-037.html shape-outside-ellipse-037-ref.html
+== shape-outside-ellipse-038.html shape-outside-ellipse-038-ref.html
+== shape-outside-ellipse-039.html shape-outside-ellipse-039-ref.html
+== shape-outside-ellipse-040.html shape-outside-ellipse-040-ref.html
+== shape-outside-ellipse-041.html shape-outside-ellipse-040-ref.html
+== shape-outside-ellipse-042.html shape-outside-ellipse-042-ref.html
+== shape-outside-ellipse-043.html shape-outside-ellipse-042-ref.html
+== shape-outside-ellipse-044.html shape-outside-ellipse-044-ref.html
+== shape-outside-ellipse-045.html shape-outside-ellipse-045-ref.html
+== shape-outside-ellipse-046.html shape-outside-ellipse-046-ref.html
+== shape-outside-ellipse-047.html shape-outside-ellipse-047-ref.html
+== shape-outside-ellipse-048.html shape-outside-ellipse-048-ref.html
+== shape-outside-ellipse-049.html shape-outside-ellipse-049-ref.html
+== shape-outside-ellipse-050.html shape-outside-ellipse-050-ref.html
+== shape-outside-ellipse-051.html shape-outside-ellipse-051-ref.html
 
 # Basic shape: inset()
-== shape-outside-inset-001.html shape-outside-inset-001-ref.html
-== shape-outside-inset-002.html shape-outside-inset-002-ref.html
-== shape-outside-inset-003.html shape-outside-inset-003-ref.html
-== shape-outside-inset-004.html shape-outside-inset-004-ref.html
-== shape-outside-inset-005.html shape-outside-inset-005-ref.html
-== shape-outside-inset-006.html shape-outside-inset-006-ref.html
-== shape-outside-inset-007.html shape-outside-inset-007-ref.html
-== shape-outside-inset-008.html shape-outside-inset-008-ref.html
-== shape-outside-inset-009.html shape-outside-inset-009-ref.html
-== shape-outside-inset-010.html shape-outside-inset-010-ref.html
-== shape-outside-inset-011.html shape-outside-inset-011-ref.html
-== shape-outside-inset-012.html shape-outside-inset-012-ref.html
+== shape-outside-inset-016.html shape-outside-inset-016-ref.html
+== shape-outside-inset-017.html shape-outside-inset-017-ref.html
+== shape-outside-inset-018.html shape-outside-inset-018-ref.html
+== shape-outside-inset-019.html shape-outside-inset-019-ref.html
+== shape-outside-inset-020.html shape-outside-inset-020-ref.html
+== shape-outside-inset-021.html shape-outside-inset-021-ref.html
+== shape-outside-inset-022.html shape-outside-inset-022-ref.html
+== shape-outside-inset-023.html shape-outside-inset-023-ref.html
+== shape-outside-inset-024.html shape-outside-inset-024-ref.html
+== shape-outside-inset-025.html shape-outside-inset-025-ref.html
+== shape-outside-inset-026.html shape-outside-inset-026-ref.html
+== shape-outside-inset-027.html shape-outside-inset-027-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-001-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-032-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-001.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-032.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-001.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-032.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle(50% at left top)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-001-ref.html">
+  <link rel="match" href="shape-outside-circle-032-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(50% at left top) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-002-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-033-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-002.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-033.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-002.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-033.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle(50% at right bottom)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-002-ref.html">
+  <link rel="match" href="shape-outside-circle-033-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(50% at right bottom) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-003-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-034-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-003.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-034.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-003.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-034.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle(50% at right top)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-003-ref.html">
+  <link rel="match" href="shape-outside-circle-034-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(50% at right top) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-004-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-035-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-004.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-035.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-004.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-035.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle(50% at left bottom)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-004-ref.html">
+  <link rel="match" href="shape-outside-circle-035-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(50% at left bottom) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-005-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-036-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-005.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-036.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-005.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-036.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle()</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-005-ref.html">
+  <link rel="match" href="shape-outside-circle-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle() value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-006.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-037.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-006.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-037.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle(closest-side at center) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-005-ref.html">
+  <link rel="match" href="shape-outside-circle-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(closest-side at center) border-box value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-007.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-038.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-007.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-038.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle(farthest-side at center)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-005-ref.html">
+  <link rel="match" href="shape-outside-circle-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(farthest-side at center) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-008-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-008.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-008.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-039.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle(0%) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-008-ref.html">
+  <link rel="match" href="shape-outside-circle-039-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape circle(0%) border-box value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-009.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-040.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-009.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-040.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle(closest-side at left center) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-008-ref.html">
+  <link rel="match" href="shape-outside-circle-039-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape circle(closest-side at left center) border-box value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-010-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-041-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-010.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-041.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-010.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-041.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, circle(100%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-010-ref.html">
+  <link rel="match" href="shape-outside-circle-041-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(100%) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-011-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-042-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-011.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-042.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-011.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-042.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle()</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-011-ref.html">
+  <link rel="match" href="shape-outside-circle-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle() value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-012.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-043.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-012.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-043.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle(closest-side at center) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-011-ref.html">
+  <link rel="match" href="shape-outside-circle-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(closest-side at center) border-box value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-013.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-044.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-013.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-044.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle(farthest-side at center)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-011-ref.html">
+  <link rel="match" href="shape-outside-circle-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(farthest-side at center) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-014-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-014.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-014.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-045.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle(0%) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-014-ref.html">
+  <link rel="match" href="shape-outside-circle-045-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape circle(0%) border-box value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-015.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-046.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-015.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-046.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle(closest-side at right center) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-014-ref.html">
+  <link rel="match" href="shape-outside-circle-045-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape circle(closest-side at right center) border-box value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-016-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-047-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-016.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-047.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-016.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-047.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, circle(100%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-016-ref.html">
+  <link rel="match" href="shape-outside-circle-047-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(100%) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-017-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-048-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-017.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-048.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-017.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-048.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-rl, float left, circle(50% at left 40px top 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-017-ref.html">
+  <link rel="match" href="shape-outside-circle-048-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at left 40px top 40px) value under vertical-rl writing-mode.">
   <style>
   .container {
     writing-mode: vertical-rl;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-018-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-049-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-018.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-049.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-018.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-049.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-rl, float right, circle(50% at left 40px bottom 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-018-ref.html">
+  <link rel="match" href="shape-outside-circle-049-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at left 40px bottom 40px) value under vertical-rl writing-mode.">
   <style>
   .container {
     writing-mode: vertical-rl;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-019-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-050-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-019.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-050.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-019.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-050.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-lr, float left, circle(50% at right 40px top 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-019-ref.html">
+  <link rel="match" href="shape-outside-circle-050-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px top 40px) value under vertical-lr writing-mode.">
   <style>
   .container {
     writing-mode: vertical-lr;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-020-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-051-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-020.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-051.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-020.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-051.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-lr, float right, circle(50% at right 40px bottom 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-020-ref.html">
+  <link rel="match" href="shape-outside-circle-051-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px bottom 40px) value under vertical-lr writing-mode.">
   <style>
   .container {
     writing-mode: vertical-lr;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-021-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-052-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-021.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-052.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-021.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-052.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: sideways-lr, float left, circle(50% at right 40px bottom 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-021-ref.html">
+  <link rel="match" href="shape-outside-circle-052-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at right 40px bottom 40px) value under sideways-lr writing-mode.">
   <style>
   .container {
     writing-mode: sideways-lr;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-022-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-053-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-022.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-053.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-022.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-053.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: sideways-lr, float right, circle(50% at right 40px top 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-022-ref.html">
+  <link rel="match" href="shape-outside-circle-053-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px top 40px) value under sideways-lr writing-mode.">
   <style>
   .container {
     writing-mode: sideways-lr;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-023-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-054-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-023.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-054.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-023.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-054.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: horizontal-tb, float left, circle(50% at left 40px bottom 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-023-ref.html">
+  <link rel="match" href="shape-outside-circle-054-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at left 40px bottom 40px) value under horizontal-tb writing-mode.">
   <style>
   .container {
     writing-mode: horizontal-tb;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-024-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-055-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-024.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-055.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-024.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-circle-055.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: horizontal-tb, float right, circle(50% at right 40px bottom 40px)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-024-ref.html">
+  <link rel="match" href="shape-outside-circle-055-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px bottom 40px) value under horizontal-tb writing-mode.">
   <style>
   .container {
     writing-mode: horizontal-tb;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-001-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-001.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-001.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, ellipse(40px 60px at left top)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-001-ref.html">
+  <link rel="match" href="shape-outside-ellipse-032-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(40px 60px at left top) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-002-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-002.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-002.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, ellipse(40px 60px at right bottom)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-002-ref.html">
+  <link rel="match" href="shape-outside-ellipse-033-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(40px 60px at right bottom) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-003-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-003.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-003.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, ellipse(40px 60px at right top)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-003-ref.html">
+  <link rel="match" href="shape-outside-ellipse-034-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(40px 60px at right top)">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-004-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-004.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-004.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, ellipse(40px 60px at left bottom)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-004-ref.html">
+  <link rel="match" href="shape-outside-ellipse-035-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(40px 60px at left bottom) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-005-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-005.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-005.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, ellipse()</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-005-ref.html">
+  <link rel="match" href="shape-outside-ellipse-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse() value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-006-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-006.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-006.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, ellipse(closest-side farthest-side at left 40px top 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-006-ref.html">
+  <link rel="match" href="shape-outside-ellipse-037-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-007-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-007.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-007.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, ellipse()</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-007-ref.html">
+  <link rel="match" href="shape-outside-ellipse-038-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse() value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-008-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-008.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-008.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, ellipse(closest-side farthest-side at right 40px top 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-008-ref.html">
+  <link rel="match" href="shape-outside-ellipse-039-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at right 40px top 60px) border-box">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-009-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-009.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-009.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, ellipse(0% 0%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-009-ref.html">
+  <link rel="match" href="shape-outside-ellipse-040-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape ellipse(0% 0%) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-010.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-041.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-010.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-041.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, ellipse(closest-side closest-side at top left)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-009-ref.html">
+  <link rel="match" href="shape-outside-ellipse-040-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape ellipse(0% 0closest-side closest-side at top left) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-011-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-011.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-011.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, ellipse(0% 0%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-011-ref.html">
+  <link rel="match" href="shape-outside-ellipse-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape ellipse(0% 0%) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-012.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-043.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-012.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-043.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, ellipse(closest-side closest-side at top right)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-011-ref.html">
+  <link rel="match" href="shape-outside-ellipse-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape ellipse(0% 0closest-side closest-side at top right) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-013-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-013.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-013.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, ellipse(100% 100%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-013-ref.html">
+  <link rel="match" href="shape-outside-ellipse-044-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(100% 100%) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-014-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-014.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-014.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, ellipse(100% 100%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-014-ref.html">
+  <link rel="match" href="shape-outside-ellipse-045-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(100% 100%) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-015-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-015.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-015.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-rl, float left, ellipse(closest-side farthest-side at top 40px right 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-015-ref.html">
+  <link rel="match" href="shape-outside-ellipse-046-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at top 40px right 60px) border-box">
   <style>
   .container {
     writing-mode: vertical-rl;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-016-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-016.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-016.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-rl, float right, ellipse(closest-side farthest-side at top 40px right 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-016-ref.html">
+  <link rel="match" href="shape-outside-ellipse-047-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at top 40px right 60px) border-box">
   <style>
   .container {
     writing-mode: vertical-rl;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-017-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-017.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-017.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-lr, float left, ellipse(closest-side farthest-side at top 40px left 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-017-ref.html">
+  <link rel="match" href="shape-outside-ellipse-048-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
   .container {
     writing-mode: vertical-lr;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-018-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-018.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-018.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-lr, float right, ellipse(closest-side farthest-side at top 40px left 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-018-ref.html">
+  <link rel="match" href="shape-outside-ellipse-049-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
   .container {
     writing-mode: vertical-lr;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-019-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-019.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-019.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: sideways-lr, float left, ellipse(closest-side farthest-side at top 40px left 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-019-ref.html">
+  <link rel="match" href="shape-outside-ellipse-050-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
   .container {
     writing-mode: sideways-lr;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-020-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-020.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-020.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: sideways-lr, float right, ellipse(closest-side farthest-side at top 40px left 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-020-ref.html">
+  <link rel="match" href="shape-outside-ellipse-051-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
   .container {
     writing-mode: sideways-lr;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-001-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-016-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-001.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-016.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-001.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-016.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, inset(20px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-001-ref.html">
+  <link rel="match" href="shape-outside-inset-016-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(20px) border-box value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-002-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-017-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-002.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-017.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-002.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-017.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, inset(20px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-002-ref.html">
+  <link rel="match" href="shape-outside-inset-017-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(20px) border-box value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-003-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-003.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-003.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-018.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float left, inset(50%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-003-ref.html">
+  <link rel="match" href="shape-outside-inset-018-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape inset(50%) value.">
   <style>
   .container {
     width: 200px;
     line-height: 0;
   }
 
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-004-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-004.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-004.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-019.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: float right, inset(50%)</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-004-ref.html">
+  <link rel="match" href="shape-outside-inset-019-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape inset(50%) value.">
   <style>
   .container {
     direction: rtl;
     width: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-005-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-020-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-005.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-020.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-005.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-020.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: horizontal-tb, float left, inset(10px round 0 40px/ 0 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-005-ref.html">
+  <link rel="match" href="shape-outside-inset-020-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 0 40px/ 0 60px) border-box value under horizontal-tb writing-mode.">
   <style>
   .container {
     writing-mode: horizontal-tb;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-006-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-021-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-006.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-021.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-006.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-021.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: horizontal-tb, float right, inset(10px round 0 40px/ 0 60px) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-006-ref.html">
+  <link rel="match" href="shape-outside-inset-021-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 0 40px/ 0 60px) border-box value under horizontal-tb writing-mode.">
   <style>
   .container {
     writing-mode: horizontal-tb;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-007-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-022-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-007.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-022.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-007.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-022.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-rl, float left, inset(10px round 60px 0/ 40px 0) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-007-ref.html">
+  <link rel="match" href="shape-outside-inset-022-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-rl writing-mode.">
   <style>
   .container {
     writing-mode: vertical-rl;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-008-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-023-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-008.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-023.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-008.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-023.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-rl, float right, inset(10px round 60px 0/ 40px 0) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-008-ref.html">
+  <link rel="match" href="shape-outside-inset-023-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-rl writing-mode.">
   <style>
   .container {
     writing-mode: vertical-rl;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-009-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-024-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-009.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-024.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-009.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-024.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-lr, float left, inset(10px round 60px 0/ 40px 0) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-009-ref.html">
+  <link rel="match" href="shape-outside-inset-024-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-lr writing-mode.">
   <style>
   .container {
     writing-mode: vertical-lr;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-010-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-025-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-010.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-025.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-010.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-025.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: vertical-lr, float right, inset(10px round 60px 0/ 40px 0) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-010-ref.html">
+  <link rel="match" href="shape-outside-inset-025-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-lr writing-mode.">
   <style>
   .container {
     writing-mode: vertical-lr;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-011-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-026-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-011.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-026.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-011.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-026.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: sideways-lr, float left, inset(10px round 60px 0/ 40px 0) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-011-ref.html">
+  <link rel="match" href="shape-outside-inset-026-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under sideways-lr writing-mode.">
   <style>
   .container {
     writing-mode: sideways-lr;
     inline-size: 200px;
     line-height: 0;
   }
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-012-ref.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-027-ref.html
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-012.html
rename to layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-027.html
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-012.html
+++ b/layout/reftests/w3c-css/submitted/shapes1/shape-outside-inset-027.html
@@ -3,17 +3,17 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <meta charset="utf-8">
   <title>CSS Shape Test: sideways-lr, float right, inset(10px round 60px 0/ 40px 0) border-box</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-012-ref.html">
+  <link rel="match" href="shape-outside-inset-027-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under sideways-lr writing-mode.">
   <style>
   .container {
     writing-mode: sideways-lr;
     direction: rtl;
     inline-size: 200px;
     line-height: 0;