Bug 1430817: Update tests. r=mats
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 24 Jan 2018 17:37:22 +0100
changeset 401282 a257c8b3582a423d1fdd0ae92574cc50ca07685b
parent 401281 715eee480c0f2601ea314c3301f6b717f2393d18
child 401283 e635716b691edfd15e2d30299f232298a123a60f
push id33342
push userrgurzau@mozilla.com
push dateTue, 30 Jan 2018 09:59:26 +0000
treeherdermozilla-central@a23e3bbd2019 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs1430817
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1430817: Update tests. r=mats MozReview-Commit-ID: 3kAGxIxUIcP
layout/reftests/css-grid/grid-column-gap-001-ref.html
layout/reftests/css-grid/grid-column-gap-001.html
layout/reftests/css-grid/grid-container-baselines-003-ref.html
layout/reftests/css-grid/grid-container-baselines-003.html
layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-001-ref.html
layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-001.html
layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-004-ref.html
layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-004.html
layout/reftests/css-grid/grid-item-overflow-stretch-004-ref.html
layout/reftests/css-grid/grid-item-self-baseline-001-ref.html
layout/reftests/css-grid/grid-item-self-baseline-001.html
layout/reftests/css-grid/grid-justify-content-003-ref.html
layout/reftests/css-grid/grid-justify-content-003.html
layout/reftests/css-grid/grid-row-gap-002-ref.html
layout/reftests/css-grid/grid-row-gap-002.html
layout/reftests/css-grid/grid-row-gap-003-ref.html
layout/reftests/css-grid/grid-row-gap-003.html
layout/reftests/css-grid/grid-row-gap-004-ref.html
layout/reftests/css-grid/grid-row-gap-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-align-content-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-align-content-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-justify-content-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-justify-content-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-001-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-001.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-002-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-002.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-001-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-001.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-002-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-002.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-001-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-001.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-002-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-002.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-001-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-001.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-002-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-002.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-003-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-003.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-004-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-004.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-001-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-001.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-002-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-002.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-003-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-003.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-004-ref.html
layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-vertWM-004.html
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-001-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-001a.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-001b.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-001-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-001a.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-001b.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-horiz-001-block.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-horiz-001-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-horiz-001-table.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-vert-001-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-vert-001.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-vert-rtl-001.xhtml
layout/style/test/property_database.js
layout/style/test/test_align_justify_computed_values.html
testing/web-platform/meta/MANIFEST.json
testing/web-platform/meta/css/css-align/content-distribution/place-content-shorthand-001.html.ini
testing/web-platform/meta/css/css-align/content-distribution/place-content-shorthand-002.html.ini
testing/web-platform/meta/css/css-align/content-distribution/place-content-shorthand-006.html.ini
testing/web-platform/meta/css/css-align/default-alignment/place-items-shorthand-001.html.ini
testing/web-platform/meta/css/css-align/default-alignment/place-items-shorthand-002.html.ini
testing/web-platform/meta/css/css-align/self-alignment/place-self-shorthand-001.html.ini
testing/web-platform/meta/css/css-align/self-alignment/place-self-shorthand-002.html.ini
testing/web-platform/meta/css/css-align/self-alignment/place-self-shorthand-006.html.ini
testing/web-platform/tests/css/css-align/content-distribution/place-content-shorthand-002.html
testing/web-platform/tests/css/css-align/resources/alignment-parsing-utils.js
testing/web-platform/tests/css/css-align/self-alignment/place-self-shorthand-002.html
testing/web-platform/tests/css/css-align/self-alignment/place-self-shorthand-006.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-block.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-table.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001.xhtml
testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js
--- a/layout/reftests/css-grid/grid-column-gap-001-ref.html
+++ b/layout/reftests/css-grid/grid-column-gap-001-ref.html
@@ -29,41 +29,41 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var justify = [
    "start",
-   "end",
-   "center",
-   "start",
-   "end",
+   // "end",
+   // "center",
+   // "start",
+   // "end",
    "start",
    "start",
    "start",
    "start",
    "end",
    "center",
    "start",
-   "end",
-   "start",
-   "end safe",
-   "end",
-   "center",
+   // "end",
+   // "start",
+   // "end safe",
+   // "end",
    "center",
-   "end",
-   "end safe",
-   "start",
+   // "center",
+   // "end",
+   // "end safe",
+   // "start",
    "center",
-   "end",
-   "end safe",
-   "left",
-   "end",
+   // "end",
+   // "end safe",
+   // "left",
+   // "end",
 ];
 var cols = [ "0", "1", "2", "3", "8", "9" ];
 var widths = [ "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < justify.length; ++j) {
   // document.body.appendChild(document.createTextNode(justify[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden");
@@ -84,27 +84,31 @@ for (var j = 0; j < justify.length; ++j)
           numCols += gapCols*parseInt(gaps[g]);
           span.style.gridColumn = "1 / span " + numCols;
           for (var x = 0; x < numCols; ++x) {
             var item = document.createElement('x');
             if (x % (1+(parseInt(gaps[g]))) != 0)
               item.className = "gap";
             grid.appendChild(item);
           }
-          if (j < 5) { // The stretch tests.
+          // if (j < 5) { // The stretch tests.
+          if (j < 1) { // The stretch test.
             if (c == 1)
               grid.style.background = 'pink'
           }
-          if (j == 6 && cols[c] == 1) { // The 'end safe' tests.
+          // if (j == 6 && cols[c] == 1) { // The 'safe end' tests.
+          if (j == 2 && cols[c] == 1) { // The 'safe end' tests.
             if (widths[w] != 0) grid.style.justifyContent = 'end';
           }
-          if (j == 7 && cols[c] == 1) { // The 'center safe' tests.
+          // if (j == 7 && cols[c] == 1) { // The 'safe center' tests.
+          if (j == 3 && cols[c] == 1) { // The 'safe center' tests.
             if (widths[w] != 0) grid.style.justifyContent = 'center';
           }
-          if (j > 15) { // The space-around and space-evenly tests.
+          // if (j > 15) { // The space-around and space-evenly tests.
+          if (j > 7) { // The space-around and space-evenly tests.
             if (cols[c] == 1) {
               if (widths[w] == 0) {
                 if (grid.style.justifyContent != 'end') {
                   grid.style.justifyContent = 'start';
                 }
               } else {
                 grid.style.justifyContent = 'center';
               }
--- a/layout/reftests/css-grid/grid-column-gap-001.html
+++ b/layout/reftests/css-grid/grid-column-gap-001.html
@@ -31,41 +31,45 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var justify = [
    "stretch",
-   "stretch end",
-   "stretch center",
-   "stretch end safe",
-   "stretch end unsafe",
-   "start safe",
-   "end safe",
-   "center safe",
-   "start unsafe",
-   "end unsafe",
-   "center unsafe",
+   // FIXME: When https://github.com/w3c/csswg-drafts/issues/1002 is implemented.
+   // "stretch end",
+   // "stretch center",
+   // "stretch safe end",
+   // "stretch unsafe end",
+   "safe start",
+   "safe end",
+   "safe center",
+   "unsafe start",
+   "unsafe end",
+   "unsafe center",
    "space-between",
-   "space-between end",
-   "space-between start",
-   "space-between end safe",
-   "space-between end unsafe",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-between end",
+   // "space-between start",
+   // "space-between safe end",
+   // "space-between unsafe end",
    "space-around",
-   "space-around center",
-   "space-around right",
-   "space-around right safe",
-   "space-around left",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-around center",
+   // "space-around right",
+   // "space-around safe right",
+   // "space-around left",
    "space-evenly",
-   "space-evenly flex-end",
-   "space-evenly flex-end safe",
-   "space-evenly flex-start unsafe",
-   "space-evenly right",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-evenly flex-end",
+   // "space-evenly safe flex-end",
+   // "space-evenly unsafe flex-start",
+   // "space-evenly right",
 ];
 var cols = [ "0", "1", "2", "3", "8", "9" ];
 var widths = [ "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < justify.length; ++j) {
   // document.body.appendChild(document.createTextNode(justify[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden");
--- a/layout/reftests/css-grid/grid-container-baselines-003-ref.html
+++ b/layout/reftests/css-grid/grid-container-baselines-003-ref.html
@@ -89,27 +89,27 @@ A<div class="ib">
      class="a f" style="width:30px; margin-top:7px; padding-top:5px; padding-bottom:18px;">A<br>B</span><span
      class="a f" style="float:right; width:30px; position:relative; left:-4px; padding-bottom:22px; margin-top:-100px">A<br>B</span>
   </div><span class="i a f" style="width:54px">C<br>D</span><span
      class="a f" style="width:54px; padding-top:20px;">E<br>F</span>
 </div>
 
 <br>
 
-<x style="position:relative; top:-64px">A</x><div class="ib" style="width:200px;margin-top:32px">
+<x style="position:relative; top:-64px">A</x><div class="ib" style="width:200px;margin-top:3px">
   <div class="ib vl" style="height:70px; width:196px;">
     <span class="a" style="display:block; padding-block-end:15px; height:1px">A<br>B</span>
   </div>
 </div><div class="ib" style="width:200px">
   <div class="ib vl" style="height:70px; width:196px;">
     <span class="a" style="display:block; padding-block-end:15px; width:148px; height:1px">A<br>B</span>
   </div>
-</div><div class="ib" style="width:200px;position:relative; top:-31px">
+</div><div class="ib" style="width:200px;position:relative;">
   <div class="ib vl" style="height:70px; width:196px;">
-    <span class="a" style="display:block; height:-moz-min-content; padding-block-end:15px; width:148px; height:-moz-min-content">A<br>B</span>
+    <span class="a" style="display:block; padding-block-end:15px; width:148px; height:1px">A<br>B</span>
   </div>
 </div>
 
 <br>
 
 A<div class="igrid slb">
   <div class="igrid slb" style="grid: 7px 13px 100px / 36px 3px; grid-row: span 4;">
     <n></n>
--- a/layout/reftests/css-grid/grid-container-baselines-003.html
+++ b/layout/reftests/css-grid/grid-container-baselines-003.html
@@ -40,18 +40,16 @@ html,body {
 span:nth-of-type(1) { font-size:32px; }
 span:nth-of-type(2) { font-size:36px; }
 span:nth-of-type(3) { font-size:48px; }
 span:nth-of-type(4) { font-size:24px; }
 span.i { font-size:12px; grid-column:2; }
 
 .sfb { align-self:baseline; }
 .slb { align-self:last baseline; align-content:self-end; }
-.jfb { justify-self:baseline; justify-content:self-end; }
-.jlb { justify-self:last baseline; justify-content:self-end; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
@@ -140,39 +138,16 @@ A<div class="igrid sfb">
   </div>
   <span class="sfb i a" style="grid-row:1">C<br>D</span>
   <span class="sfb a " style="grid-row:1; grid-column:3; padding-top:20px">E<br>F</span>
   <n></n>
 </div>
 
 <br>
 
-<!-- TODO: impossible to make a reference due to bug 1166120
-
-A<div class="igrid" style="grid: auto / 100px;">
-<span class="jfb a vlr" style="margin:1px 3px 5px 7px">A<br>B</span>
-</div>
-<div class="igrid" style="grid: auto / 100px;">
-<span class="jlb a vlr" style="margin:1px 3px 5px 7px">A<br>B</span>
-</div>
-<div class="igrid slb" style="grid: auto / 100px;">
-<span class="jlb a vlr" style="margin:1px 3px 5px 7px">A<br>B</span>
-</div>
-<div class="igrid vl" style="grid: 100px / 50px;">
-<span class="jlb a" style="margin:1px 3px 5px 7px">A<br>B</span>
-</div>
-<div class="igrid slb vl" style="grid: 100px / 50px;">
-<span class="jfb a" style="margin:1px 3px 5px 7px">A<br>B</span>
-</div>
-<div class="igrid sfb vl" style="grid: 100px / 50px;">
-<span class="jfb a" style="margin:1px 3px 5px 7px">A<br>B</span>
-</div>
-
--->
-
 <!--  TODO: figure out a way to make a reference for these:
 
 A<div class="igrid" style="grid-template-columns:200px">
   <div class="igrid slb vl" style="grid: 1fr / 7px 13px 50px; grid-row: span 4;">
     <n></n>
     <n></n>
     <span class="slb a" style="margin-block-end:27px; padding-block-end:15px;">A<br>B</span>
   </div>
@@ -201,17 +176,17 @@ A<div class="igrid" style="grid-template
 </div><div class="igrid" style="grid-template-columns:200px">
   <div class="igrid sfb vl" style="grid: 1fr / 7px 13px 50px; grid-row: span 4;">
     <span class="a" style="margin-block-end:27px; padding-block-end:15px;">A<br>B</span>
     <n></n>
     <n></n>
   </div>
 </div><div class="igrid" style="grid-template-columns:200px">
   <div class="igrid sfb vl" style="grid: 1fr / 7px 13px 50px; grid-row: span 4;">
-    <span class="jfb a" style="margin-block-end:27px; padding-block-end:15px;">A<br>B</span>
+    <span class="a" style="margin-block-end:27px; padding-block-end:15px;">A<br>B</span>
     <n></n>
     <n></n>
   </div>
 </div>
 
 <br>
 
 A<div class="igrid slb">
--- a/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-001-ref.html
+++ b/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-001-ref.html
@@ -47,39 +47,39 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: 8px / 10px">
 <img src="support/lime-24x2.png" style="justify-self:start; width:24px; height:8px">
 </div>
 
 <br>
 
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe end; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe end; height:24px; width:10px">
 </div>
 
 <div class="grid" style="grid: 4px / 10px">
-<img src="support/lime-24x2.png" style="justify-self:start unsafe; width:24px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start; width:24px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:start safe; width:24px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:safe start; width:24px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe; width:24px; height:4px; margin-right:-14px">
+<img src="support/lime-24x2.png" style="justify-self:unsafe end; width:24px; height:4px; margin-right:-14px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 80px">
-<img src="support/lime-24x2.png" style="justify-self:end safe; width:24px; height:4px; margin-left:-38px">
+<img src="support/lime-24x2.png" style="justify-self:safe end; width:24px; height:4px; margin-left:-38px">
 </div>
 
 <br>
 
 <div class="vertical-tests">
 
 <div class="grid" style="grid: 96px / 20px">
 <img src="support/lime-2x24.png" style="height:96px; width:20px">
@@ -107,37 +107,37 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: 8px / 10px">
 <img src="support/lime-24x2.png" style="justify-self:start; width:24px; height:8px">
 </div>
 
 <br>
 
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe end; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe end; height:24px; width:10px">
 </div>
 
 <div class="grid" style="grid: 4px / 10px">
-<img src="support/lime-24x2.png" style="justify-self:start unsafe; width:24px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start; width:24px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:start safe; width:24px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:safe start; width:24px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe; width:24px; height:4px; margin-right:-14px">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start; width:24px; height:4px; margin-right:-14px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 80px">
-<img src="support/lime-24x2.png" style="justify-self:end safe; width:24px; height:4px; margin-left:-38px">
+<img src="support/lime-24x2.png" style="justify-self:safe end; width:24px; height:4px; margin-left:-38px">
 </div>
 
 </div>
 
 </body>
 </html>
--- a/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-001.html
+++ b/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-001.html
@@ -53,39 +53,39 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: 8px / 10px">
 <img src="support/lime-24x2.png" style="justify-self:start">
 </div>
 
 <br>
 
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start safe;">
+<img src="support/lime-2x24.png" style="align-self:safe start;">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe start;">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end safe;">
+<img src="support/lime-2x24.png" style="align-self:safe end;">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe end;">
 </div>
 
 <div class="grid" style="grid: 4px / 10px">
-<img src="support/lime-24x2.png" style="justify-self:start safe">
+<img src="support/lime-24x2.png" style="justify-self:safe start">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:start unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:end safe">
+<img src="support/lime-24x2.png" style="justify-self:safe end">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 80px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe end">
 </div>
 
 <br>
 
 <div class="vertical-tests">
 
 <div class="grid" style="grid: 96px / 20px">
 <img src="support/lime-2x24.png">
@@ -113,37 +113,37 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: 8px / 10px">
 <img src="support/lime-24x2.png" style="justify-self:start">
 </div>
 
 <br>
 
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start safe;">
+<img src="support/lime-2x24.png" style="align-self:safe start;">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe start;">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end safe;">
+<img src="support/lime-2x24.png" style="align-self:safe end;">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe end;">
 </div>
 
 <div class="grid" style="grid: 4px / 10px">
-<img src="support/lime-24x2.png" style="justify-self:start safe">
+<img src="support/lime-24x2.png" style="justify-self:safe start">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:start unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:end safe">
+<img src="support/lime-24x2.png" style="justify-self:safe end">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 80px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe end">
 </div>
 
 </div>
 
 </body>
 </html>
--- a/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-004-ref.html
+++ b/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-004-ref.html
@@ -47,39 +47,39 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: 8px / 10px; width:24px">
 <img src="support/lime-24x2.png" style="justify-self:start; width:10px; height:8px">
 </div>
 
 <br>
 
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe end; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe end; height:24px; width:10px">
 </div>
 
 <div class="grid" style="grid: 4px / 10px; width:24px">
-<img src="support/lime-24x2.png" style="justify-self:start unsafe; width:10px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start; width:10px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px; width:24px">
-<img src="support/lime-24x2.png" style="justify-self:start safe; width:10px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:safe start; width:10px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px; width:24px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe; width:10px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:unsafe end; width:10px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 80px; width:24px">
-<img src="support/lime-24x2.png" style="justify-self:end safe; width:10px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:safe end; width:10px; height:4px">
 </div>
 
 <br>
 
 <div class="vertical-tests">
 
 <div class="grid" style="grid: 96px / 20px">
 <img src="support/lime-2x24.png" style="height:96px; width:20px">
@@ -107,37 +107,37 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: 8px / 10px; width:24px">
 <img src="support/lime-24x2.png" style="justify-self:start; width:10px; height:8px">
 </div>
 
 <br>
 
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:start safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe start; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end unsafe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:unsafe end; height:24px; width:10px">
 </div>
 <div class="grid" style="grid: 96px / 10px">
-<img src="support/lime-2x24.png" style="align-self:end safe; height:24px; width:10px">
+<img src="support/lime-2x24.png" style="align-self:safe end; height:24px; width:10px">
 </div>
 
 <div class="grid" style="grid: 4px / 10px; width:24px">
 <img src="support/lime-24x2.png" style="justify-self:start unsafe; width:10px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px; width:24px">
-<img src="support/lime-24x2.png" style="justify-self:start safe; width:10px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:safe start; width:10px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 40px; width:24px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe; width:10px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:unsafe end; width:10px; height:4px">
 </div>
 <div class="grid" style="grid: 4px / 10px; margin-left: 80px; width:24px">
-<img src="support/lime-24x2.png" style="justify-self:end safe; width:10px; height:4px">
+<img src="support/lime-24x2.png" style="justify-self:safe end; width:10px; height:4px">
 </div>
 
 </div>
 
 </body>
 </html>
--- a/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-004.html
+++ b/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-004.html
@@ -49,39 +49,39 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: minmax(auto, 8px) / minmax(auto, 10px)">
 <img src="support/lime-24x2.png" style="justify-self:start">
 </div>
 
 <br>
 
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:start safe;">
+<img src="support/lime-2x24.png" style="align-self:safe start;">
 </div>
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:start unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe start;">
 </div>
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:end safe;">
+<img src="support/lime-2x24.png" style="align-self:safe end;">
 </div>
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:end unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe end;">
 </div>
 
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px)">
-<img src="support/lime-24x2.png" style="justify-self:start safe">
+<img src="support/lime-24x2.png" style="justify-self:safe start">
 </div>
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px); margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:start unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start">
 </div>
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px); margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:end safe">
+<img src="support/lime-24x2.png" style="justify-self:safe end">
 </div>
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px); margin-left: 80px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe end">
 </div>
 
 <br>
 
 <div class="vertical-tests">
 
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 20px)">
 <img src="support/lime-2x24.png">
@@ -109,37 +109,37 @@ body,html { color:black; background:whit
 </div>
 <div class="grid" style="grid: minmax(auto, 8px) / minmax(auto, 10px)">
 <img src="support/lime-24x2.png" style="justify-self:start">
 </div>
 
 <br>
 
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:start safe;">
+<img src="support/lime-2x24.png" style="align-self:safe start;">
 </div>
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:start unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe start;">
 </div>
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:end safe;">
+<img src="support/lime-2x24.png" style="align-self:safe end;">
 </div>
 <div class="grid" style="grid: minmax(auto, 96px) / minmax(auto, 10px)">
-<img src="support/lime-2x24.png" style="align-self:end unsafe;">
+<img src="support/lime-2x24.png" style="align-self:unsafe end;">
 </div>
 
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px)">
-<img src="support/lime-24x2.png" style="justify-self:start safe">
+<img src="support/lime-24x2.png" style="justify-self:safe start">
 </div>
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px); margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:start unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe start">
 </div>
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px); margin-left: 40px">
-<img src="support/lime-24x2.png" style="justify-self:end safe">
+<img src="support/lime-24x2.png" style="justify-self:safe end">
 </div>
 <div class="grid" style="grid: minmax(auto, 4px) / minmax(auto, 10px); margin-left: 80px">
-<img src="support/lime-24x2.png" style="justify-self:end unsafe">
+<img src="support/lime-24x2.png" style="justify-self:unsafe end">
 </div>
 
 </div>
 
 </body>
 </html>
--- a/layout/reftests/css-grid/grid-item-overflow-stretch-004-ref.html
+++ b/layout/reftests/css-grid/grid-item-overflow-stretch-004-ref.html
@@ -25,18 +25,18 @@ body,html { color:black; background:whit
   grid-area: 2/2;
   border:1px solid;
   min-width: 0;
   max-width: 100px;
 }
 .h .grid > * {
   min-height: 0;
   max-height: 100px;
-  justify-self:center safe;
-  align-self:center safe;
+  justify-self: safe center;
+  align-self: safe center;
 }
 .h > .grid { grid: 7px 102px 3px / 7px 70px 3px; grid-gap: 5px;}
 .h > .grid.c2 { grid: 7px 30px 3px / 7px 70px 3px; grid-gap: 5px;}
 .h > .grid.c3 { grid: 7px 108px 3px / 7px 70px 3px; grid-gap: 5px;}
 
 .oa { overflow: auto; }
 .p { width: 100%; }
 .h .grid > .p { height: 100%; }
--- a/layout/reftests/css-grid/grid-item-self-baseline-001-ref.html
+++ b/layout/reftests/css-grid/grid-item-self-baseline-001-ref.html
@@ -67,25 +67,16 @@ span:nth-child(4) { font-size:32px; }
 <div><span class="lb hl pbe">A</span><span class="lb hl">A</span><span class="lb hl">A</span><span class="lb hl">A</span></div>
 <div class="vl"><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 <div class="vl"><span class="lb pbs">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 <div class="vr"><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 <div class="vr"><span class="lb pbe">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 
 <br clear="all">
 
-<div class="grid vl"><span class="fb vl">A</span><span class="fb vl">A</span><span class="fb vl">A</span><span class="fb vl">A</span></div>
-<div class="grid vl"><span class="fb vl pbe">A</span><span class="fb vl">A</span><span class="fb vl">A</span><span class="fb vl">A</span></div>
-<div class="grid"><span class="fb">A</span><span class="fb">A</span><span class="fb">A</span><span class="fb">A</span></div>
-<div class="grid"><span class="fb pbs">A</span><span class="fb">A</span><span class="fb">A</span><span class="fb">A</span></div>
-<div class="grid"><span class="fb" style="order:99">A</span><span class="fb" style="order:98">A</span><span class="fb" style="order:97">A</span><span class="fb" style="order:96">A</span></div>
-<div class="grid"><span class="fb pbe" style="order:99;">A</span><span class="fb" style="order:98">A</span><span class="fb" style="order:97">A</span><span class="fb" style="order:96">A</span></div>
-
-<br clear="all">
-
 <div><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span></div>
 <div><span class="lb hl pbe">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span></div>
 <div class="vl"><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 <div class="vl"><span class="lb pbs">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 <div class="vr"><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 <div class="vr"><span class="lb pbe">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 
 </body>
--- a/layout/reftests/css-grid/grid-item-self-baseline-001.html
+++ b/layout/reftests/css-grid/grid-item-self-baseline-001.html
@@ -38,19 +38,16 @@ span:nth-child(2) { font-size:16px; }
 span:nth-child(3) { font-size:24px; }
 span:nth-child(4) { font-size:32px; }
 .pbe { padding-block-end:20px; }
 .pbs { padding-block-start:20px; }
 
 .fb { align-self:baseline; }
 .lb { align-self:last baseline; }
 
-.jfb { justify-self:baseline; }
-.jlb { justify-self:last baseline; }
-
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
 </style>
@@ -70,25 +67,16 @@ span:nth-child(4) { font-size:32px; }
 <div class="grid"><span class="lb hl pbe">A</span><span class="lb hl">A</span><span class="lb hl">A</span><span class="lb hl">A</span></div>
 <div class="grid vl"><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 <div class="grid vl"><span class="lb pbs">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 <div class="grid vr"><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 <div class="grid vr"><span class="lb pbe">A</span><span class="lb">A</span><span class="lb">A</span><span class="lb">A</span></div>
 
 <br clear="all">
 
-<div class="grid c"><span class="jfb vl">A</span><span class="jfb vl">A</span><span class="jfb vl">A</span><span class="jfb vl">A</span></div>
-<div class="grid c"><span class="jfb vl pbe">A</span><span class="jfb vl">A</span><span class="jfb vl">A</span><span class="jfb vl">A</span></div>
-<div class="grid c vl"><span class="jfb hl">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span></div>
-<div class="grid c vl"><span class="jfb hl pbs">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span></div>
-<div class="grid c vr"><span class="jfb hl">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span></div>
-<div class="grid c vr"><span class="jfb hl pbe">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span><span class="jfb hl">A</span></div>
-
-<br clear="all">
-
 <div class="grid"><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span></div>
 <div class="grid"><span class="lb hl pbe">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span><span class="lb hl">A<br>A</span></div>
 <div class="grid vl"><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 <div class="grid vl"><span class="lb pbs">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 <div class="grid vr"><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 <div class="grid vr"><span class="lb pbe">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span><span class="lb">A<br>A</span></div>
 
 </body>
--- a/layout/reftests/css-grid/grid-justify-content-003-ref.html
+++ b/layout/reftests/css-grid/grid-justify-content-003-ref.html
@@ -29,41 +29,41 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var justify = [
    "start",
-   "end",
-   "center",
-   "start",
-   "end",
+   // "end",
+   // "center",
+   // "start",
+   // "end",
    "start",
    "start",
    "start",
    "start",
    "end",
    "center",
    "start",
-   "end",
-   "start",
-   "end safe",
-   "end",
-   "center",
+   // "end",
+   // "start",
+   // "end safe",
+   // "end",
    "center",
-   "end",
-   "end safe",
-   "start",
+   // "center",
+   // "end",
+   // "end safe",
+   // "start",
    "center",
-   "end",
-   "end safe",
-   "left",
-   "end",
+   // "end",
+   // "end safe",
+   // "left",
+   // "end",
 ];
 var cols = [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ];
 var widths = [ "0", "1", "2", "3", "4", "5", "6" ];
 for (var j = 0; j < justify.length; ++j) {
   // document.body.appendChild(document.createTextNode(justify[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden");
   for (var c = 0; c < cols.length; ++c) {
@@ -76,27 +76,31 @@ for (var j = 0; j < justify.length; ++j)
       grid.className = "grid";
       grid.style.justifyContent = justify[j];
       var span = document.createElement('span');
       span.style.gridColumn = "1 / span " + cols[c];
       grid.appendChild(span);
       for (var x = 0; x < cols[c]; ++x) {
         grid.appendChild(document.createElement('x'));
       }
-      if (j < 5) { // The stretch tests.
+      // if (j < 5) { // The stretch tests.
+      if (j < 1) { // The stretch test.
         if (c == 1)
           grid.style.background = 'pink'
       }
-      if (j == 6 && cols[c] == 1) { // The 'end safe' tests.
+      // if (j == 6 && cols[c] == 1) { // The 'safe end' tests.
+      if (j == 2 && cols[c] == 1) { // The 'safe end' tests.
         if (widths[w] != 0) grid.style.justifyContent = 'end';
       }
-      if (j == 7 && cols[c] == 1) { // The 'center safe' tests.
+      // if (j == 7 && cols[c] == 1) { // The 'safe center' tests.
+      if (j == 3 && cols[c] == 1) { // The 'safe center' tests.
         if (widths[w] != 0) grid.style.justifyContent = 'center';
       }
-      if (j > 15) { // The space-around and space-evenly tests.
+      // if (j > 15) { // The space-around and space-evenly tests.
+      if (j > 7) { // The space-around and space-evenly tests.
         if (cols[c] == 1) {
           if (widths[w] == 0) {
             if (grid.style.justifyContent != 'end') {
               grid.style.justifyContent = 'start';
             }
           } else {
             grid.style.justifyContent = 'center';
           }
--- a/layout/reftests/css-grid/grid-justify-content-003.html
+++ b/layout/reftests/css-grid/grid-justify-content-003.html
@@ -31,41 +31,45 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var justify = [
    "stretch",
-   "stretch end",
-   "stretch center",
-   "stretch end safe",
-   "stretch end unsafe",
-   "start safe",
-   "end safe",
-   "center safe",
-   "start unsafe",
-   "end unsafe",
-   "center unsafe",
+   // FIXME: When https://github.com/w3c/csswg-drafts/issues/1002 is implemented.
+   // "stretch end",
+   // "stretch center",
+   // "stretch safe end",
+   // "stretch unsafe end",
+   "safe start",
+   "safe end",
+   "safe center",
+   "unsafe start",
+   "unsafe end",
+   "unsafe center",
    "space-between",
-   "space-between end",
-   "space-between start",
-   "space-between end safe",
-   "space-between end unsafe",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-between end",
+   // "space-between start",
+   // "space-between safe end",
+   // "space-between unsafe end",
    "space-around",
-   "space-around center",
-   "space-around right",
-   "space-around right safe",
-   "space-around left",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-around center",
+   // "space-around right",
+   // "space-around safe right",
+   // "space-around left",
    "space-evenly",
-   "space-evenly flex-end",
-   "space-evenly flex-end safe",
-   "space-evenly flex-start unsafe",
-   "space-evenly right",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-evenly flex-end",
+   // "space-evenly safe flex-end",
+   // "space-evenly unsafe flex-start",
+   // "space-evenly right",
 ];
 var cols = [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ];
 var widths = [ "0", "1", "2", "3", "4", "5", "6" ];
 for (var j = 0; j < justify.length; ++j) {
   // document.body.appendChild(document.createTextNode(justify[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden");
   for (var c = 0; c < cols.length; ++c) {
--- a/layout/reftests/css-grid/grid-row-gap-002-ref.html
+++ b/layout/reftests/css-grid/grid-row-gap-002-ref.html
@@ -29,37 +29,37 @@ x { background: lime; width:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var align = [
    "start",
-   "end",
-   "center",
-   "start",
-   "end",
+   // "end",
+   // "center",
+   // "start",
+   // "end",
    "start",
    "start",
    "start",
    "start",
    "end",
    "center",
    "start",
-   "end",
-   "start",
-   "end safe",
-   "center",
+   // "end",
+   // "start",
+   // "safe end",
    "center",
-   "start",
-   "end safe",
-   "start",
+   // "center",
+   // "start",
+   // "safe end",
+   // "start",
    "center",
-   "end",
+   // "end",
 ];
 var rows = [ "0", "1", "2", "3", "8", "9" ];
 var heights = [ "auto", "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < align.length; ++j) {
   // document.body.appendChild(document.createTextNode(align[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden");
@@ -80,27 +80,31 @@ for (var j = 0; j < align.length; ++j) {
           numRows += gapRows*parseInt(gaps[g]);
           span.style.gridRow = "1 / span " + numRows;
           for (var x = 0; x < numRows; ++x) {
             var item = document.createElement('x');
             if (x % (1+(parseInt(gaps[g]))) != 0)
               item.className = "gap";
             grid.appendChild(item);
           }
-          if (j < 5) { // The stretch tests.
+          // if (j < 5) { // The stretch tests.
+          if (j < 1) { // The stretch test.
             if (c == 1)
               grid.style.background = 'pink'
           }
-          if (j == 6 && rows[c] == 1) { // The 'end safe' tests.
+          // if (j == 6 && rows[c] == 1) { // The 'safe end' tests.
+          if (j == 2 && rows[c] == 1) { // The 'safe end' tests.
             if (heights[w] != 0) grid.style.alignContent = 'end';
           }
-          if (j == 7 && rows[c] == 1) { // The 'center safe' tests.
+          // if (j == 7 && rows[c] == 1) { // The 'safe center' tests.
+          if (j == 3 && rows[c] == 1) { // The 'safe center' tests.
             if (heights[w] != 0) grid.style.alignContent = 'center';
           }
-          if (j > 15) { // The space-around and space-evenly tests.
+          // if (j > 15) { // The space-around and space-evenly tests.
+          if (j > 7) { // The space-around and space-evenly tests.
             if (rows[c] == 1) {
               if (heights[w] == 0) {
                 if (grid.style.alignContent != 'end') {
                   grid.style.alignContent = 'start';
                 }
               } else {
                 grid.style.alignContent = 'center';
               }
--- a/layout/reftests/css-grid/grid-row-gap-002.html
+++ b/layout/reftests/css-grid/grid-row-gap-002.html
@@ -31,37 +31,40 @@ x { background: lime; width:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var align = [
    "stretch",
-   "stretch end",
-   "stretch center",
-   "stretch end safe",
-   "stretch end unsafe",
-   "start safe",
-   "end safe",
-   "center safe",
-   "start unsafe",
-   "end unsafe",
-   "center unsafe",
+   // FIXME: When https://github.com/w3c/csswg-drafts/issues/1002 is implemented.
+   // "stretch end",
+   // "stretch center",
+   // "stretch safe end",
+   // "stretch unsafe end",
+   "safe start",
+   "safe end",
+   "safe center",
+   "unsafe start",
+   "unsafe end",
+   "unsafe center",
    "space-between",
-   "space-between end",
-   "space-between start",
-   "space-between end safe",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-between end",
+   // "space-between start",
+   // "space-between safe end",
    "space-around",
-   "space-around center",
-   "space-around right",
-   "space-around right safe",
-   "space-around left",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-around center",
+   // "space-around right",
+   // "space-around safe right",
+   // "space-around left",
    "space-evenly",
-   "space-evenly end",
+   // "space-evenly end",
 ];
 var rows = [ "0", "1", "2", "3", "8", "9" ];
 var heights = [ "auto", "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < align.length; ++j) {
   // document.body.appendChild(document.createTextNode(align[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden");
--- a/layout/reftests/css-grid/grid-row-gap-003-ref.html
+++ b/layout/reftests/css-grid/grid-row-gap-003-ref.html
@@ -31,37 +31,37 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var align = [
    "start",
-   "end",
-   "center",
-   "start",
-   "end",
+   // "end",
+   // "center",
+   // "start",
+   // "end",
    "start",
    "start",
    "start",
    "start",
    "end",
    "center",
    "start",
-   "end",
-   "start",
-   "end safe",
-   "center",
+   // "end",
+   // "start",
+   // "safe end",
    "center",
-   "start",
-   "end safe",
-   "start",
+   // "center",
+   // "start",
+   // "safe end",
+   // "start",
    "center",
-   "end",
+   // "end",
 ];
 var rows = [ "0", "1", "2", "3", "8", "9" ];
 var heights = [ "auto", "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < align.length; ++j) {
   // document.body.appendChild(document.createTextNode(align[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden; float:left;");
@@ -82,27 +82,31 @@ for (var j = 0; j < align.length; ++j) {
           numRows += gapRows*parseInt(gaps[g]);
           span.style.gridRow = "1 / span " + numRows;
           for (var x = 0; x < numRows; ++x) {
             var item = document.createElement('x');
             if (x % (1+(parseInt(gaps[g]))) != 0)
               item.className = "gap";
             grid.appendChild(item);
           }
-          if (j < 5) { // The stretch tests.
+          // if (j < 5) { // The stretch tests.
+          if (j < 1) { // The stretch test.
             if (c == 1)
               grid.style.background = 'pink'
           }
-          if (j == 6 && rows[c] == 1) { // The 'end safe' tests.
+          // if (j == 6 && rows[c] == 1) { // The 'safe end' tests.
+          if (j == 2 && rows[c] == 1) { // The 'safe end' tests.
             if (heights[w] != 0) grid.style.alignContent = 'end';
           }
-          if (j == 7 && rows[c] == 1) { // The 'center safe' tests.
+          // if (j == 7 && rows[c] == 1) { // The 'safe center' tests.
+          if (j == 3 && rows[c] == 1) { // The 'safe center' tests.
             if (heights[w] != 0) grid.style.alignContent = 'center';
           }
-          if (j > 15) { // The space-around and space-evenly tests.
+          // if (j > 15) { // The space-around and space-evenly tests.
+          if (j > 7) { // The space-around and space-evenly tests.
             if (rows[c] == 1) {
               if (heights[w] == 0) {
                 if (grid.style.alignContent != 'end') {
                   grid.style.alignContent = 'start';
                 }
               } else {
                 grid.style.alignContent = 'center';
               }
--- a/layout/reftests/css-grid/grid-row-gap-003.html
+++ b/layout/reftests/css-grid/grid-row-gap-003.html
@@ -33,37 +33,40 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var align = [
    "stretch",
-   "stretch end",
-   "stretch center",
-   "stretch end safe",
-   "stretch end unsafe",
-   "start safe",
-   "end safe",
-   "center safe",
-   "start unsafe",
-   "end unsafe",
-   "center unsafe",
+   // FIXME: When https://github.com/w3c/csswg-drafts/issues/1002 is implemented.
+   // "stretch end",
+   // "stretch center",
+   // "stretch safe end",
+   // "stretch unsafe end",
+   "safe start",
+   "safe end",
+   "safe center",
+   "unsafe start",
+   "unsafe end",
+   "unsafe center",
    "space-between",
-   "space-between end",
-   "space-between start",
-   "space-between end safe",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-between end",
+   // "space-between start",
+   // "space-between safe end",
    "space-around",
-   "space-around center",
-   "space-around right",
-   "space-around right safe",
-   "space-around left",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-around center",
+   // "space-around right",
+   // "space-around safe right",
+   // "space-around left",
    "space-evenly",
-   "space-evenly end",
+   // "space-evenly end",
 ];
 var rows = [ "0", "1", "2", "3", "8", "9" ];
 var heights = [ "auto", "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < align.length; ++j) {
   // document.body.appendChild(document.createTextNode(align[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden; float:left;");
--- a/layout/reftests/css-grid/grid-row-gap-004-ref.html
+++ b/layout/reftests/css-grid/grid-row-gap-004-ref.html
@@ -31,37 +31,37 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var align = [
    "start",
-   "end",
-   "center",
-   "start",
-   "end",
+   // "end",
+   // "center",
+   // "start",
+   // "end",
    "start",
    "start",
    "start",
    "start",
    "end",
    "center",
    "start",
-   "end",
-   "start",
-   "end safe",
-   "center",
+   // "end",
+   // "start",
+   // "safe end",
    "center",
-   "start",
-   "end safe",
-   "start",
+   // "center",
+   // "start",
+   // "safe end",
+   // "start",
    "center",
-   "end",
+   // "end",
 ];
 var rows = [ "0", "1", "2", "3", "8", "9" ];
 var heights = [ "auto", "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < align.length; ++j) {
   // document.body.appendChild(document.createTextNode(align[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden; float:left;");
@@ -82,27 +82,31 @@ for (var j = 0; j < align.length; ++j) {
           numRows += gapRows*parseInt(gaps[g]);
           span.style.gridRow = "1 / span " + numRows;
           for (var x = 0; x < numRows; ++x) {
             var item = document.createElement('x');
             if (x % (1+(parseInt(gaps[g]))) != 0)
               item.className = "gap";
             grid.appendChild(item);
           }
-          if (j < 5) { // The stretch tests.
+          // if (j < 5) { // The stretch tests.
+          if (j < 1) { // The stretch test.
             if (c == 1)
               grid.style.background = 'pink'
           }
-          if (j == 6 && rows[c] == 1) { // The 'end safe' tests.
+          // if (j == 6 && rows[c] == 1) { // The 'safe end' tests.
+          if (j == 2 && rows[c] == 1) { // The 'safe end' tests.
             if (heights[w] != 0) grid.style.alignContent = 'end';
           }
-          if (j == 7 && rows[c] == 1) { // The 'center safe' tests.
+          // if (j == 7 && rows[c] == 1) { // The 'safe center' tests.
+          if (j == 3 && rows[c] == 1) { // The 'safe center' tests.
             if (heights[w] != 0) grid.style.alignContent = 'center';
           }
-          if (j > 15) { // The space-around and space-evenly tests.
+          // if (j > 15) { // The space-around and space-evenly tests.
+          if (j > 7) { // The space-around and space-evenly tests.
             if (rows[c] == 1) {
               if (heights[w] != 0) {
                 grid.style.alignContent = 'center';
               }
             }
           }
           chunk.appendChild(grid);
         }
--- a/layout/reftests/css-grid/grid-row-gap-004.html
+++ b/layout/reftests/css-grid/grid-row-gap-004.html
@@ -33,37 +33,40 @@ x { background: lime; height:7px; }
   </style>
 </head>
 <body>
 
 <script>
 document.body.style.display = "none";
 var align = [
    "stretch",
-   "stretch end",
-   "stretch center",
-   "stretch end safe",
-   "stretch end unsafe",
-   "start safe",
-   "end safe",
-   "center safe",
-   "start unsafe",
-   "end unsafe",
-   "center unsafe",
+   // FIXME: When https://github.com/w3c/csswg-drafts/issues/1002 is implemented.
+   // "stretch end",
+   // "stretch center",
+   // "stretch safe end",
+   // "stretch unsafe end",
+   "safe start",
+   "safe end",
+   "safe center",
+   "unsafe start",
+   "unsafe end",
+   "unsafe center",
    "space-between",
-   "space-between end",
-   "space-between start",
-   "space-between end safe",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-between end",
+   // "space-between start",
+   // "space-between safe end",
    "space-around",
-   "space-around center",
-   "space-around right",
-   "space-around right safe",
-   "space-around left",
+   // FIXME: https://github.com/w3c/csswg-drafts/issues/1002
+   // "space-around center",
+   // "space-around right",
+   // "space-around safe right",
+   // "space-around left",
    "space-evenly",
-   "space-evenly end",
+   // "space-evenly end",
 ];
 var rows = [ "0", "1", "2", "3", "8", "9" ];
 var heights = [ "auto", "0", "1", "5", "6" ];
 var gaps = [ "1", "2" ];
 for (var j = 0; j < align.length; ++j) {
   // document.body.appendChild(document.createTextNode(align[j])); // for debugging
   var chunk = document.createElement('div');
   chunk.setAttribute("style", "border:1px solid; padding:2px 10px; overflow:hidden; float:left;");
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001-ref.html
@@ -62,18 +62,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -90,14 +88,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002-ref.html
@@ -62,18 +62,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -90,14 +88,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003-ref.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004-ref.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005-ref.html
@@ -62,18 +62,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -90,14 +88,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006-ref.html
@@ -62,18 +62,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -90,14 +88,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007-ref.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008-ref.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001.html
@@ -66,18 +66,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -94,14 +92,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
@@ -62,18 +62,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignEnd"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -90,14 +88,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignEnd"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002.html
@@ -66,18 +66,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -94,14 +92,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
@@ -62,18 +62,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -90,14 +88,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001.html
@@ -66,18 +66,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -94,14 +92,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
@@ -65,18 +65,16 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
@@ -93,14 +91,12 @@
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <br>
     <!-- <content-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002.html
@@ -66,18 +66,16 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
@@ -94,14 +92,12 @@
     <!-- <content-position>, part 1 -->
     <div class="container" style="align-content: center"><div></div></div>
     <div class="container" style="align-content: start"><div></div></div>
     <div class="container" style="align-content: end"><div></div></div>
     <br>
     <!-- <content-position>, part 2 -->
     <div class="container" style="align-content: flex-start"><div></div></div>
     <div class="container" style="align-content: flex-end"><div></div></div>
-    <div class="container" style="align-content: left"><div></div></div>
-    <div class="container" style="align-content: right"><div></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001-ref.html
@@ -60,18 +60,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002-ref.html
@@ -60,18 +60,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005-ref.html
@@ -60,18 +60,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006-ref.html
@@ -60,18 +60,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignEnd"><!--flex-start--></div></div>
     <div class="container"><div class="alignStart"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002.html
@@ -60,18 +60,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
@@ -60,18 +60,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignEnd"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignEnd"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
@@ -60,18 +60,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignEnd"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignEnd"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004.html
@@ -60,18 +60,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -86,14 +84,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003.html
@@ -59,18 +59,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
@@ -63,18 +63,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -89,14 +87,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignEnd"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004.html
@@ -61,18 +61,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -87,14 +85,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-align-content-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-align-content-001-ref.html
@@ -46,30 +46,42 @@
   <div class="big">
     <!-- <content-distribution> with implied fallback -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
-    <div class="container"><div class="alignEnd"><!--space-between--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-around--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
-    <div class="container"><div class="alignEnd"><!--stretch--></div></div>
+    <div style="display: none">
+      <!--
+        These tests will be valid when
+        https://github.com/w3c/csswg-drafts/issues/1002 is fixed
+      -->
+      <div class="container"><div class="alignEnd"><!--space-between--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-around--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
+      <div class="container"><div class="alignEnd"><!--stretch--></div></div>
+    </div>
     <br>
   </div>
   <div class="small">
     <!-- <content-distribution> with implied fallback -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
-    <div class="container"><div class="alignEnd"><!--space-between--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-around--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
-    <div class="container"><div class="alignEnd"><!--stretch--></div></div>
+    <div style="display: none">
+      <!--
+        These tests will be valid when
+        https://github.com/w3c/csswg-drafts/issues/1002 is fixed
+      -->
+      <div class="container"><div class="alignEnd"><!--space-between--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-around--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
+      <div class="container"><div class="alignEnd"><!--stretch--></div></div>
+    </div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-align-content-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-align-content-001.html
@@ -44,29 +44,33 @@
   <div class="big">
     <!-- <content-distribution> with implied fallback -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
+    <!--
     <div class="container" style="align-content: space-between flex-end"><div></div></div>
     <div class="container" style="align-content: space-around flex-end"><div></div></div>
     <div class="container" style="align-content: space-evenly flex-end"><div></div></div>
     <div class="container" style="align-content: stretch flex-end"><div></div></div>
+    -->
     <br>
   </div>
   <div class="small">
     <!-- <content-distribution> with implied fallback -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
+    <!--
     <div class="container" style="align-content: space-between flex-end"><div></div></div>
     <div class="container" style="align-content: space-around flex-end"><div></div></div>
     <div class="container" style="align-content: space-evenly flex-end"><div></div></div>
     <div class="container" style="align-content: stretch flex-end"><div></div></div>
+    -->
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-justify-content-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-justify-content-001-ref.html
@@ -46,30 +46,34 @@
   <div class="big">
     <!-- <content-distribution> with implied fallback -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
-    <div class="container"><div class="alignEnd"><!--space-between--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-around--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
-    <div class="container"><div class="alignStart"><!--stretch--></div></div>
+    <div style="display: none">
+      <div class="container"><div class="alignEnd"><!--space-between--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-around--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
+      <div class="container"><div class="alignStart"><!--stretch--></div></div>
+    </div>
     <br>
   </div>
   <div class="small">
     <!-- <content-distribution> with implied fallback -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
-    <div class="container"><div class="alignEnd"><!--space-between--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-around--></div></div>
-    <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
-    <div class="container"><div class="alignStart"><!--stretch--></div></div>
+    <div style="display: none">
+      <div class="container"><div class="alignEnd"><!--space-between--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-around--></div></div>
+      <div class="container"><div class="alignEnd"><!--space-evenly--></div></div>
+      <div class="container"><div class="alignStart"><!--stretch--></div></div>
+    </div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-justify-content-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-fallback-justify-content-001.html
@@ -44,33 +44,37 @@
   <div class="big">
     <!-- <content-distribution> with implied fallback -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
+    <!-- TODO: https://github.com/w3c/csswg-drafts/issues/1002
     <div class="container" style="justify-content: space-between flex-end"><div></div></div>
     <div class="container" style="justify-content: space-around flex-end"><div></div></div>
     <div class="container" style="justify-content: space-evenly flex-end"><div></div></div>
     <div class="container" style="justify-content: stretch flex-end"><div></div></div>
+    -->
     <!-- Note: specifically for flex containers, in the justify-content axis,
          "stretch behaves as flex-start (ignoring the specified fallback
          alignment, if any." https://drafts.csswg.org/css-align-3/#distribution-flex -->
     <br>
   </div>
   <div class="small">
     <!-- <content-distribution> with implied fallback -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-distribution> with explicit "flex-end" fallback -->
+    <!-- TODO: https://github.com/w3c/csswg-drafts/issues/1002
     <div class="container" style="justify-content: space-between flex-end"><div></div></div>
     <div class="container" style="justify-content: space-around flex-end"><div></div></div>
     <div class="container" style="justify-content: space-evenly flex-end"><div></div></div>
     <div class="container" style="justify-content: stretch flex-end"><div></div></div>
+    -->
     <!-- As noted above, the explicit fallback for "stretch" is ignored here. -->
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008.html
@@ -42,20 +42,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -70,20 +66,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001.html
@@ -43,20 +43,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -71,20 +67,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
@@ -47,20 +47,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -75,20 +71,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002.html
@@ -43,20 +43,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -71,20 +67,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
@@ -47,20 +47,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -75,20 +71,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
@@ -43,20 +43,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -71,20 +67,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
@@ -44,20 +44,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
@@ -72,20 +68,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
@@ -43,20 +43,16 @@
 </head>
 <body>
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
@@ -71,20 +67,16 @@
     <br>
   </div>
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last baseline"><div></div></div>
-    <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
     <div class="container" style="justify-content: center"><div></div></div>
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-001-ref.html
@@ -61,18 +61,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -87,14 +85,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-001.html
@@ -62,18 +62,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -88,14 +86,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-002-ref.html
@@ -59,18 +59,16 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
@@ -85,14 +83,12 @@
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
     <div class="container"><div class="alignStart"><!--flex-start--></div></div>
     <div class="container"><div class="alignEnd"><!--flex-end--></div></div>
-    <div class="container"><div class="alignStart"><!--left--></div></div>
-    <div class="container"><div class="alignStart"><!--right--></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-align-self-002.html
@@ -61,18 +61,16 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
   <div class="small">
     <!-- The various align-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
@@ -87,14 +85,12 @@
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
     <div class="container"><div style="align-self: flex-start"></div></div>
     <div class="container"><div style="align-self: flex-end"></div></div>
-    <div class="container"><div style="align-self: left"></div></div>
-    <div class="container"><div style="align-self: right"></div></div>
     <br>
   </div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-001-ref.html
@@ -48,20 +48,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
@@ -74,20 +70,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-001.html
@@ -49,20 +49,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
@@ -75,20 +71,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-002-ref.html
@@ -46,20 +46,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
@@ -72,20 +68,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignCenter"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-002.html
@@ -48,20 +48,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
@@ -74,20 +70,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-001-ref.html
@@ -49,22 +49,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--auto--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--normal--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--stretch--></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignStart"><!--baseline--></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignEnd"><!--last baseline--></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignCenter"><!--center--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--start--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignEnd"><!--end--></div>
     <div class="container"><img src="support/colors-8x16.png"
@@ -89,22 +83,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--auto--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--normal--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--stretch--></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignStart"><!--baseline--></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignEnd"><!--last baseline--></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignCenter"><!--center--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--start--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignEnd"><!--end--></div>
     <div class="container"><img src="support/colors-8x16.png"
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-001.html
@@ -48,22 +48,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: auto"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: normal"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: stretch"></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: baseline"></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: last baseline"></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: center"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: start"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: end"></div>
     <div class="container"><img src="support/colors-8x16.png"
@@ -88,22 +82,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: auto"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: normal"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: stretch"></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: baseline"></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: last baseline"></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: center"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: start"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: end"></div>
     <div class="container"><img src="support/colors-8x16.png"
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-002-ref.html
@@ -47,22 +47,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--auto--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--normal--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--stretch--></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignStart"><!--baseline--></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignEnd"><!--last baseline--></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignCenter"><!--center--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--start--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignEnd"><!--end--></div>
     <div class="container"><img src="support/colors-8x16.png"
@@ -87,22 +81,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--auto--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--normal--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--stretch--></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignStart"><!--baseline--></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                class="alignEnd"><!--last baseline--></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignCenter"><!--center--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignStart"><!--start--></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 class="alignEnd"><!--end--></div>
     <div class="container"><img src="support/colors-8x16.png"
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-img-002.html
@@ -47,22 +47,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: auto"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: normal"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: stretch"></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: baseline"></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: last baseline"></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: center"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: start"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: end"></div>
     <div class="container"><img src="support/colors-8x16.png"
@@ -87,22 +81,16 @@
     <!-- auto | normal | stretch -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: auto"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: normal"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: stretch"></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: baseline"></div>
-    <div class="container"><img src="support/colors-8x16.png"
-                                style="justify-self: last baseline"></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: center"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: start"></div>
     <div class="container"><img src="support/colors-8x16.png"
                                 style="justify-self: end"></div>
     <div class="container"><img src="support/colors-8x16.png"
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-001-ref.html
@@ -48,20 +48,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
@@ -74,20 +70,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-001.html
@@ -49,20 +49,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
@@ -75,20 +71,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-002-ref.html
@@ -48,20 +48,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
@@ -74,20 +70,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-002.html
@@ -50,20 +50,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
@@ -76,20 +72,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-003-ref.html
@@ -46,20 +46,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
@@ -72,20 +68,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-003.html
@@ -48,20 +48,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
@@ -74,20 +70,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-004-ref.html
@@ -46,20 +46,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
@@ -72,20 +68,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
-    <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
     <!-- <self-position>, part 2: -->
--- a/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/grid-abspos-staticpos-justify-self-rtl-004.html
@@ -49,20 +49,16 @@
   <div class="big">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->
@@ -75,20 +71,16 @@
   <div class="small">
     <!-- The various justify-self values, from
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
-    <!-- <baseline-position> -->
-    <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last baseline"></div></div>
-    <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
     <!-- <self-position>, part 2 -->