Bug 1594821 [wpt PR 20156] - WPT: Move css-intrinsic-size to css-sizing/intrinsic-size + add assert., a=testonly
authorVladimir Levin <vmpstr@chromium.org>
Mon, 25 Nov 2019 16:25:38 +0000
changeset 504412 3915d877e1bc65312c5f510cadcb09c34daf7d69
parent 504411 e82f7a0128ff36aace85a19dc6e348cca77e7339
child 504413 801c085b7fb6f4df1a5b6e7ad4736ac003d1e919
push id36862
push useraciure@mozilla.com
push dateFri, 29 Nov 2019 21:26:53 +0000
treeherdermozilla-central@b4b10ae558b9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1594821, 20156, 1903843, 713508
milestone72.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 1594821 [wpt PR 20156] - WPT: Move css-intrinsic-size to css-sizing/intrinsic-size + add assert., a=testonly Automatic update from web-platform-tests WPT: Move css-intrinsic-size to css-sizing/intrinsic-size + add assert. This patch moves the directory for the intrinsic-size tests from css/css-intrinsic-size to css/css-sizing/intrinsic-size It also adds meta assert tags for the tests that explain what the test is testing. R=chrishtr@chromium.org, tabatkins@chromium.org Change-Id: Ie09b8185b0df4d641eec916f52e16b7cda371219 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1903843 Commit-Queue: Chris Harrelson <chrishtr@chromium.org> Reviewed-by: Chris Harrelson <chrishtr@chromium.org> Cr-Commit-Position: refs/heads/master@{#713508} -- wpt-commits: 9ca10f118e10d95606525a632ba3c0f85318e6d3 wpt-pr: 20156
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-001-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-001.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-002-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-002.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-003-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-003.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-004-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-004.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-005-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-005.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-006-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-006.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-007-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-007.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-008-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-008.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-009-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-009.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-010-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-010.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-011-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-011.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-012-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-012.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-013-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-013.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-014-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-014.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-015-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-015.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-016-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-016.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-017-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-017.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-018-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-018.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-019-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-019.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-020-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-020.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-021-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-021.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-022-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-022.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-023-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-023.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-024-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-024.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-025-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-025.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-026-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-026.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-001-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-001.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-002-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-002.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-003-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-003.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-001-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-001.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-002-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-002.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-003-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-003.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-004-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-004.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-005-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-005.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-006-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-006.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-007-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-007.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-008-ref.html
testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-008.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-block-size-computed.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-block-size-invalid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-block-size-valid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-height-computed.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-height-invalid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-height-valid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-inline-size-computed.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-inline-size-invalid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-inline-size-valid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-computed.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-invalid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-sets-computed-dimensions.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-valid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-width-computed.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-width-invalid.html
testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-width-valid.html
testing/web-platform/tests/css/css-intrinsic-size/resources/dice.png
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-001-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-001.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-002-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-002.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-003-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-003.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-004-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-004.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-005-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-005.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-006-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-006.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-007-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-007.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-008-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-008.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-009-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-009.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-010-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-010.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-011-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-011.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-012-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-012.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-013-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-013.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-014-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-014.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-015-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-015.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-016-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-016.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-017-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-017.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-018-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-018.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-019-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-019.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-020-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-020.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-021-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-021.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-022-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-022.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-023-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-023.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-024-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-024.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-025-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-025.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-026-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-026.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-001-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-001.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-002-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-002.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-003-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-003.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-001-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-001.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-002-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-002.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-003-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-003.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-004-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-004.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-005-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-005.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-006-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-006.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-007-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-007.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-008-ref.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-008.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-block-size-computed.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-block-size-invalid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-block-size-valid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-height-computed.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-height-invalid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-height-valid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-inline-size-computed.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-inline-size-invalid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-inline-size-valid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-computed.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-invalid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-sets-computed-dimensions.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-valid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-width-computed.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-width-invalid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-width-valid.html
testing/web-platform/tests/css/css-sizing/intrinsic-size/resources/dice.png
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-001.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: unsized div</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-001-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  intrinsic-size: 111px 222px;
-}
-</style>
-
-<div id=target></div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-002.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: div with max-content parent</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-002-ref.html">
-
-<style>
-#border {
-  width: max-content;
-  border: 1px solid black;
-}
-#target {
-  background: lightblue;
-  intrinsic-size: 111px 222px;
-}
-</style>
-
-<div id=border>
-  <div id=target></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-003.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: width specified</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-003-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  intrinsic-size: 111px 222px;
-  width: 50px;
-}
-</style>
-
-<div id=target></div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-004.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: width is min-content</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-004-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  intrinsic-size: 111px 222px;
-  width: min-content;
-}
-</style>
-
-<div id=target></div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-005.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: width is max-content</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-004-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  intrinsic-size: 111px 222px;
-  width: max-content;
-}
-</style>
-
-<div id=target></div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-006.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: unsized div, intrinsic-size is small</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-006-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  intrinsic-size: 5px 6px;
-}
-</style>
-
-<div id=target>Lorem ipsum</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-007.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: div with border</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-007-ref.html">
-
-<style>
-#border {
-  border: 1px solid blue;
-  width: max-content;
-}
-
-#target {
-  background: lightblue;
-  intrinsic-size: 55px 66px;
-  border-style: solid;
-  border-color: black;
-  border-width: 2px 3px 5px 7px;
-}
-</style>
-
-<div id=border>
-  <div id=target></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-008.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: writing modes</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-008-ref.html">
-
-<style>
-.border {
-  border: 1px solid blue;
-  width: max-content;
-  margin: 5px;
-}
-
-.box {
-  background: lightblue;
-  intrinsic-size: 55px 66px;
-  border-style: solid;
-  border-color: black;
-  border-width: 2px 3px 5px 7px;
-  padding: 11px 13px 17px 19px;
-}
-.verticalrl {
-  writing-mode: vertical-rl;
-}
-.verticallr {
-  writing-mode: vertical-lr;
-}
-.horizontaltb {
-  writing-mode: horizontal-tb;
-}
-</style>
-
-<div class=border><div class="box verticalrl">Lorem</div></div>
-<div class=border><div class="box verticallr">Ipsum</div></div>
-<div class=border><div class="box horizontaltb">Dolor</div></div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-009.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: select multiple</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-009-ref.html">
-
-<style>
-.border {
-  border: 1px solid blue;
-  width: max-content;
-  margin: 5px;
-}
-
-select {
-  intrinsic-size: 55px 66px;
-  background: lightblue;
-  overflow: visible;
-}
-</style>
-
-<select multiple></select>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-010.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: flex row</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-010-ref.html">
-
-<style>
-#flex {
-  display: flex;
-  flex-direction: row;
-  width: 500px;
-  height: 100px;
-}
-.item {
-  border: 1px solid black;
-}
-#one {
-  background: lightblue;
-  intrinsic-size: 55px 11px;
-  flex-grow: 3;
-}
-#two {
-  background: lightgreen;
-  intrinsic-size: 66px 22px;
-  flex-grow: 2;
-}
-#three {
-  background: lightgrey;
-  intrinsic-size: 77px 33px;
-  flex-grow: 1;
-}
-</style>
-
-<div id=flex>
-  <div class=item id=one></div>
-  <div class=item id=two></div>
-  <div class=item id=three></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-011.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: flex column</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-011-ref.html">
-
-<style>
-#flex {
-  display: flex;
-  flex-direction: column;
-  width: 100px;
-  height: 200px;
-}
-.item {
-  border: 1px solid black;
-}
-#one {
-  background: lightblue;
-  intrinsic-size: 55px 11px;
-  flex-grow: 3;
-}
-#two {
-  background: lightgreen;
-  intrinsic-size: 66px 22px;
-  flex-grow: 2;
-}
-#three {
-  background: lightgrey;
-  intrinsic-size: 77px 33px;
-  flex-grow: 1;
-}
-</style>
-
-<div id=flex>
-  <div class=item id=one></div>
-  <div class=item id=two></div>
-  <div class=item id=three></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-012.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: replaced content</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-012-ref.html">
-
-<style>
-#target {
-  intrinsic-size: 100px 200px;
-}
-</style>
-
-<img id=target src="resources/dice.png"></img>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-013.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<html class="reftest-wait">
-<meta charset="utf8">
-<title>CSS intrinsic-size: intrinsic-size changes.</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-013-ref.html">
-<script src="/common/reftest-wait.js"></script>
-
-<style>
-#border {
-  width: max-content;
-  border: 1px solid black;
-}
-#border > div {
-  intrinsic-size: 55px 66px;
-}
-</style>
-
-<div id=border><div id=target></div></div>
-
-<script>
-function changeStyle() {
-  document.getElementById("target").style = "intrinsic-size: 77px 88px;";
-  requestAnimationFrame(takeScreenshot);
-}
-
-onload = () => requestAnimationFrame(() => requestAnimationFrame(changeStyle));
-
-</script>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-014.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: fieldset</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-014-ref.html">
-
-<style>
-fieldset {
-  width: max-content;
-  intrinsic-size: 111px 222px;
-}
-</style>
-
-<fieldset>
-  <legend>This is a legend</legend>
-  This is some content.
-</fieldset>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-015.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS intrinsic-size: inline flex</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-size">
-<link rel="match" href="intrinsic-size-015-ref.html">
-<style>
-div {
-  display: inline-flex;
-  border: 5px solid green;
-  intrinsic-size: 111px 222px;
-  color: transparent;
-}
-</style>
-
-<div>test</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-016.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: flex row, items with size containment</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-016-ref.html">
-
-<style>
-#flex {
-  display: flex;
-  flex-direction: row;
-  width: 500px;
-  height: 100px;
-}
-.item {
-  border: 1px solid black;
-  contain: size;
-}
-#one {
-  background: lightblue;
-  intrinsic-size: 55px 11px;
-  flex-grow: 3;
-}
-#two {
-  background: lightgreen;
-  intrinsic-size: 66px 22px;
-  flex-grow: 2;
-}
-#three {
-  background: lightgrey;
-  intrinsic-size: 77px 33px;
-  flex-grow: 1;
-}
-</style>
-
-<div id=flex>
-  <div class=item id=one></div>
-  <div class=item id=two></div>
-  <div class=item id=three></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-017.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: replaced content (vertical-lr)</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-017-ref.html">
-
-<style>
-body {
-  writing-mode: vertical-lr;
-}
-#target {
-  intrinsic-size: 100px 200px;
-  inline-size: min-content;
-  block-size: auto;
-}
-</style>
-
-<img id=target src="resources/dice.png"></img>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-018.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: sized div</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-018-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  width: 55px;
-  height: 66px;
-  intrinsic-size: 111px 222px;
-}
-</style>
-
-<div id=target></div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-019.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: div with fit-content width</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-019-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  intrinsic-size: 111px 222px;
-  width: fit-content;
-}
-</style>
-
-<div id=target></div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-020.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: replaced content (min-content)</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-020-ref.html">
-
-<style>
-#target {
-  intrinsic-size: 100px 200px;
-  inline-size: min-content;
-  block-size: auto;
-}
-</style>
-
-<img id=target src="resources/dice.png"></img>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-021.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: flex row, flex height based on children</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-021-ref.html">
-
-<style>
-#flex {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  align-items: flex-start;
-  width: 250px;
-}
-.item {
-  border: 1px solid black;
-}
-#one {
-  background: lightblue;
-  intrinsic-size: 55px 21px;
-}
-#two {
-  background: lightgreen;
-  intrinsic-size: 66px 42px;
-}
-#three {
-  background: lightgrey;
-  align-self: stretch;
-  intrinsic-size: 77px 63px;
-}
-</style>
-
-<div id=flex>
-  <div class=item id=one></div>
-  <div class=item id=two></div>
-  <div class=item id=three></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-022.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid definite size</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-022-ref.html">
-
-<style>
-#grid {
-  border: 3px solid black;
-  display: grid;
-  grid-template: 55px 66px / 77px 88px;
-  intrinsic-size: 70px 80px;
-  width: max-content;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.item {
-  background: lightgreen;
-  opacity: 0.5;
-  height: 100%;
-}
-</style>
-
-<div id=grid>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-023.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid indefinite size</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-023-ref.html">
-
-<style>
-#grid {
-  border: 3px solid black;
-  display: grid;
-  grid-template: 1fr 2fr / 3fr 4fr;
-  intrinsic-size: 70px 80px;
-  width: max-content;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.item {
-  background: lightgreen;
-  height: 100%;
-}
-</style>
-
-<div id=grid>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-024.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid definite size, large size</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-024-ref.html">
-
-<style>
-#grid {
-  border: 3px solid black;
-  display: grid;
-  grid-template: 55px 66px / 77px 88px;
-  intrinsic-size: 200px 300px;
-  width: max-content;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.item {
-  background: lightgreen;
-  opacity: 0.5;
-  height: 100%;
-}
-</style>
-
-<div id=grid>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-025.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid indefinite size, auto-fit</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-025-ref.html">
-
-<style>
-.grid {
-  border: 3px solid black;
-  display: grid;
-  intrinsic-size: 70px 80px;
-  width: max-content;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.one {
-  grid-template: repeat(auto-fit, 10px) / 3fr 4fr;
-}
-.two {
-  grid-template: 1fr 2fr / repeat(auto-fit, 15px);
-}
-.three {
-  grid-template: repeat(auto-fit, 10px) / repeat(auto-fit, 15px);
-}
-
-.item {
-  background: green;
-  height: 100%;
-}
-</style>
-
-<div class="grid one">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid two">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid three">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-026.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid auto-fit, min- max- size interactions</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-026-ref.html">
-
-<style>
-.grid {
-  display: inline-grid;
-  border: 1px solid black;
-  grid-template-columns: repeat(auto-fit, 100px);
-}
-.one {
-  intrinsic-width: 100px;
-  min-width: 200px;
-}
-.two {
-  intrinsic-width: 200px;
-  min-width: 100px;
-}
-.three {
-  intrinsic-width: 100px;
-  min-width: 200px;
-  max-width: 150px;
-}
-.four {
-  intrinsic-width: 200px;
-  min-width: 100px;
-  max-width: 150px;
-}
-.item {
-  background: green;
-  height: 100%;
-}
-</style>
-
-<p>min-width larger than intrinsic-width:
-<div class="grid one">
-  <div class="item">one</div>
-  <div class="item">two</div>
-</div>
-
-<p>min-width smaller than intrinsic-width:
-<div class="grid two">
-  <div class="item">one</div>
-  <div class="item">two</div>
-</div>
-
-<p>max-width ignored since min-width is larger:
-<div class="grid three">
-  <div class="item">one</div>
-  <div class="item">two</div>
-</div>
-
-<p>min-width shrinks grid since it overrides intrinsic-width:
-<div class="grid four">
-  <div class="item">one</div>
-  <div class="item">two</div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-001.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: intrinsic-width auto</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-auto-001-ref.html">
-
-<style>
-div {
-  width: max-content;
-  intrinsic-size: auto 111px;
-  border: 1px solid black;
-}
-#one {
-  overflow: hidden;
-}
-#two {
-  overflow-x: scroll;
-}
-/* We can't have overflow-x: visible without overflow-y not being visible and vice versa
-   (see Computed value in https://www.w3.org/TR/css-overflow-3/#overflow-properties).
-   Hence, we set both overflow directions.
-*/
-#three {
-  overflow: visible;
-}
-</style>
-
-<div id=one>Lorem ipsum</div>
-<br>
-<div id=two>Lorem ipsum</div>
-<br>
-<div id=three>Lorem ipsum</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-002.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: intrinsic-width auto</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-auto-002-ref.html">
-
-<style>
-div {
-  width: max-content;
-  intrinsic-size: 111px auto;
-  border: 1px solid black;
-}
-#one {
-  overflow: hidden;
-}
-#two {
-  overflow-y: scroll;
-}
-/* We can't have overflow-x: visible without overflow-y not being visible and vice versa
-   (see Computed value in https://www.w3.org/TR/css-overflow-3/#overflow-properties).
-   Hence, we set both overflow directions.
-*/
-#three {
-  overflow: visible;
-}
-</style>
-
-<div id=one>Lorem ipsum</div>
-<br>
-<div id=two>Lorem ipsum</div>
-<br>
-<div id=three>Lorem ipsum</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-003.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: replaced content with auto</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-auto-003-ref.html">
-
-<style>
-img {
-  border: 1px solid black;
-}
-#target1 {
-  intrinsic-size: auto 200px;
-}
-#target2 {
-  intrinsic-size: 100px auto;
-}
-#target3 {
-  intrinsic-size: auto 200px;
-  overflow: hidden;
-}
-#target4 {
-  intrinsic-size: 100px auto;
-  overflow: hidden;
-}
-</style>
-
-<img id=target1 src="resources/dice.png"></img>
-<img id=target2 src="resources/dice.png"></img>
-<img id=target3 src="resources/dice.png"></img>
-<img id=target4 src="resources/dice.png"></img>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-001.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: intrinsic-width legacy</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-001-ref.html">
-
-<style>
-#target {
-  background: lightblue;
-  width: max-content;
-  intrinsic-size: legacy 222px;
-}
-</style>
-
-<div id=target>Lorem ipsum</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-002.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: flex with legacy intrinsic dimensions</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-002-ref.html">
-
-<style>
-#flex {
-  display: flex;
-  flex-direction: column;
-  height: 500px;
-}
-.item {
-  width: max-content;
-}
-#one {
-  background: lightblue;
-  intrinsic-size: legacy 222px;
-  flex-grow: 3;
-}
-#two {
-  background: lightgreen;
-  intrinsic-size: 333px legacy;
-  flex-grow: 2;
-}
-#three {
-  background: lightgrey;
-  intrinsic-size: legacy 444px;
-  flex-grow: 1;
-}
-</style>
-
-<div id=flex>
-  <div class=item id=one>Lorem ipsum</div>
-  <div class=item id=two>dolor sit amet</div>
-  <div class=item id=three>consectetur adipiscing elit</div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-003.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: select multiple with legacy sizing</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-003-ref.html">
-
-<style>
-#one {
-  intrinsic-size: legacy 222px;
-}
-#two {
-  intrinsic-size: 111px legacy;
-  overflow: visible;
-}
-</style>
-
-<select multiple id=one></select>
-<select multiple id=two></select>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-004.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: replaced content with legacy</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-004-ref.html">
-
-<style>
-img {
-  border: 1px solid black;
-}
-#target1 {
-  intrinsic-size: legacy 200px;
-}
-#target2 {
-  intrinsic-size: 100px legacy;
-}
-</style>
-
-<img id=target1 src="resources/dice.png"></img>
-<img id=target2 src="resources/dice.png"></img>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-005.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid definite size with legacy</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-005-ref.html">
-
-<style>
-.grid {
-  border: 3px solid black;
-  display: grid;
-  grid-template: 55px 66px / 77px 88px;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.one {
-  intrinsic-size: legacy 80px;
-  width: 70px;
-}
-.two {
-  intrinsic-size: 70px legacy;
-  height: 80px;
-  width: min-content;
-}
-.item {
-  background: lightgreen;
-  opacity: 0.5;
-  height: 100%;
-}
-</style>
-
-<div class="grid one">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid two">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-006.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid indefinite size with legacy</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-006-ref.html">
-
-<style>
-.grid {
-  border: 3px solid black;
-  display: grid;
-  grid-template: 1fr 2fr / 3fr 4fr;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.one {
-  intrinsic-size: legacy 80px;
-  width: 70px;
-}
-.two {
-  intrinsic-size: 70px legacy;
-  width: min-content;
-  height: 80px;
-}
-.item {
-  background: lightgreen;
-  height: 100%;
-}
-</style>
-
-<div class="grid one">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid two">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-007.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid definite size, large size with legacy</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-007-ref.html">
-
-<style>
-.grid {
-  border: 3px solid black;
-  display: grid;
-  grid-template: 55px 66px / 77px 88px;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.one {
-  intrinsic-size: legacy 300px;
-  width: 200px;
-}
-.two {
-  intrinsic-size: 200px legacy;
-  width: max-content;
-  height: 300px;
-}
-.item {
-  background: lightgreen;
-  height: 100%;
-}
-</style>
-
-<div class="grid one">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid two">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-008.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>CSS intrinsic-size: grid indefinite size, auto-fit with legacy</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
-<link rel="match" href="intrinsic-size-with-legacy-008-ref.html">
-
-<style>
-.grid {
-  border: 3px solid black;
-  display: grid;
-  background: lightblue;
-  grid-gap: 5px;
-}
-.one {
-  grid-template: repeat(auto-fit, 10px) / 3fr 4fr;
-}
-.two {
-  grid-template: 1fr 2fr / repeat(auto-fit, 15px);
-}
-.three {
-  grid-template: repeat(auto-fit, 10px) / repeat(auto-fit, 15px);
-}
-.width {
-  intrinsic-size: 70px legacy;
-  width: max-content;
-  height: 80px;
-}
-.height {
-  intrinsic-size: legacy 80px;
-  width: 70px;
-}
-.item {
-  background: green;
-  height: 100%;
-}
-</style>
-
-<div class="grid one width">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid two width">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid three width">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid one height">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid two height">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
-<div class="grid three height">
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-  <div class=item></div>
-</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-001-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-001-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-001.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: unsized div</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-001-ref.html">
+<meta name="assert" content="intrinsic-size is used to size the div as if it had a single child of this size">
+
+<style>
+#target {
+  background: lightblue;
+  intrinsic-size: 111px 222px;
+}
+</style>
+
+<div id=target></div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-002-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-002-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-002.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: div with max-content parent</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-002-ref.html">
+<meta name="assert" content="intrinsic-size is used to size the div, with parent's max-content width respecting it">
+
+<style>
+#border {
+  width: max-content;
+  border: 1px solid black;
+}
+#target {
+  background: lightblue;
+  intrinsic-size: 111px 222px;
+}
+</style>
+
+<div id=border>
+  <div id=target></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-003-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-003-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-003.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: width specified</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-003-ref.html">
+<meta name="assert" content="intrinsic-size's width is ignored if width is specified">
+
+<style>
+#target {
+  background: lightblue;
+  intrinsic-size: 111px 222px;
+  width: 50px;
+}
+</style>
+
+<div id=target></div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-004-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-004-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-004.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: width is min-content</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-004-ref.html">
+<meta name="assert" content="div is sized to intrinsic-width if width is min-content">
+
+<style>
+#target {
+  background: lightblue;
+  intrinsic-size: 111px 222px;
+  width: min-content;
+}
+</style>
+
+<div id=target></div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-005-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-005-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-005.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: width is max-content</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-004-ref.html">
+<meta name="assert" content="div is sized to intrinsic-width if width is max-content">
+
+<style>
+#target {
+  background: lightblue;
+  intrinsic-size: 111px 222px;
+  width: max-content;
+}
+</style>
+
+<div id=target></div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-006-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-006-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-006.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: unsized div, intrinsic-size is small</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-006-ref.html">
+<meta name="assert" content="content dimensions are ignored if intrinsic-size is specified">
+
+<style>
+#target {
+  background: lightblue;
+  intrinsic-size: 5px 6px;
+}
+</style>
+
+<div id=target>Lorem ipsum</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-007-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-007-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-007.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: div with border</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-007-ref.html">
+<meta name="assert" content="intrinsic-size sizes the content box, not the border box">
+
+<style>
+#border {
+  border: 1px solid blue;
+  width: max-content;
+}
+
+#target {
+  background: lightblue;
+  intrinsic-size: 55px 66px;
+  border-style: solid;
+  border-color: black;
+  border-width: 2px 3px 5px 7px;
+}
+</style>
+
+<div id=border>
+  <div id=target></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-008-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-008-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-008.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: writing modes</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-008-ref.html">
+<meta name="assert" content="intrinsic-size specifies physical dimensions, and respects writing modes">
+
+<style>
+.border {
+  border: 1px solid blue;
+  width: max-content;
+  margin: 5px;
+}
+
+.box {
+  background: lightblue;
+  intrinsic-size: 55px 66px;
+  border-style: solid;
+  border-color: black;
+  border-width: 2px 3px 5px 7px;
+  padding: 11px 13px 17px 19px;
+}
+.verticalrl {
+  writing-mode: vertical-rl;
+}
+.verticallr {
+  writing-mode: vertical-lr;
+}
+.horizontaltb {
+  writing-mode: horizontal-tb;
+}
+</style>
+
+<div class=border><div class="box verticalrl">Lorem</div></div>
+<div class=border><div class="box verticallr">Ipsum</div></div>
+<div class=border><div class="box horizontaltb">Dolor</div></div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-009-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-009-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-009.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: select multiple</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-009-ref.html">
+<meta name="assert" content="intrinsic-size sizes select multiple">
+
+<style>
+.border {
+  border: 1px solid blue;
+  width: max-content;
+  margin: 5px;
+}
+
+select {
+  intrinsic-size: 55px 66px;
+  background: lightblue;
+  overflow: visible;
+}
+</style>
+
+<select multiple></select>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-010-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-010-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-010.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: flex row</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-010-ref.html">
+<meta name="assert" content="items are flexed correctly when they are sized by intrinsic-size in a flex row">
+
+<style>
+#flex {
+  display: flex;
+  flex-direction: row;
+  width: 500px;
+  height: 100px;
+}
+.item {
+  border: 1px solid black;
+}
+#one {
+  background: lightblue;
+  intrinsic-size: 55px 11px;
+  flex-grow: 3;
+}
+#two {
+  background: lightgreen;
+  intrinsic-size: 66px 22px;
+  flex-grow: 2;
+}
+#three {
+  background: lightgrey;
+  intrinsic-size: 77px 33px;
+  flex-grow: 1;
+}
+</style>
+
+<div id=flex>
+  <div class=item id=one></div>
+  <div class=item id=two></div>
+  <div class=item id=three></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-011-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-011-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-011.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: flex column</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-011-ref.html">
+<meta name="assert" content="items are flexed correctly when they are sized by intrinsic-size in a flex column">
+
+<style>
+#flex {
+  display: flex;
+  flex-direction: column;
+  width: 100px;
+  height: 200px;
+}
+.item {
+  border: 1px solid black;
+}
+#one {
+  background: lightblue;
+  intrinsic-size: 55px 11px;
+  flex-grow: 3;
+}
+#two {
+  background: lightgreen;
+  intrinsic-size: 66px 22px;
+  flex-grow: 2;
+}
+#three {
+  background: lightgrey;
+  intrinsic-size: 77px 33px;
+  flex-grow: 1;
+}
+</style>
+
+<div id=flex>
+  <div class=item id=one></div>
+  <div class=item id=two></div>
+  <div class=item id=three></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-012-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-012-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-012.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: replaced content</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-012-ref.html">
+<meta name="assert" content="intrinsic-size overrides replaced content's intrinsic dimensions">
+
+<style>
+#target {
+  intrinsic-size: 100px 200px;
+}
+</style>
+
+<img id=target src="resources/dice.png"></img>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-013-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-013-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-013.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf8">
+<title>CSS intrinsic-size: intrinsic-size changes.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-013-ref.html">
+<meta name="assert" content="changes in intrinsic-size cause reflow">
+<script src="/common/reftest-wait.js"></script>
+
+<style>
+#border {
+  width: max-content;
+  border: 1px solid black;
+}
+#border > div {
+  intrinsic-size: 55px 66px;
+}
+</style>
+
+<div id=border><div id=target></div></div>
+
+<script>
+function changeStyle() {
+  document.getElementById("target").style = "intrinsic-size: 77px 88px;";
+  requestAnimationFrame(takeScreenshot);
+}
+
+onload = () => requestAnimationFrame(() => requestAnimationFrame(changeStyle));
+
+</script>
+</html>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-014-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-014-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-014.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: fieldset</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-014-ref.html">
+<meta name="assert" content="intrinsic-size sizes fieldsets">
+
+<style>
+fieldset {
+  width: max-content;
+  intrinsic-size: 111px 222px;
+}
+</style>
+
+<fieldset>
+  <legend>This is a legend</legend>
+  This is some content.
+</fieldset>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-015-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-015-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-015.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS intrinsic-size: inline flex</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-size">
+<link rel="match" href="intrinsic-size-015-ref.html">
+<meta name="assert" content="intrinsic-size sizes an inline-flex element">
+<style>
+div {
+  display: inline-flex;
+  border: 5px solid green;
+  intrinsic-size: 111px 222px;
+  color: transparent;
+}
+</style>
+
+<div>test</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-016-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-016-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-016.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: flex row, items with size containment</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-016-ref.html">
+<meta name="assert" content="intrinsic-size take 'priority' over size-containment in flex">
+
+<style>
+#flex {
+  display: flex;
+  flex-direction: row;
+  width: 500px;
+  height: 100px;
+}
+.item {
+  border: 1px solid black;
+  contain: size;
+}
+#one {
+  background: lightblue;
+  intrinsic-size: 55px 11px;
+  flex-grow: 3;
+}
+#two {
+  background: lightgreen;
+  intrinsic-size: 66px 22px;
+  flex-grow: 2;
+}
+#three {
+  background: lightgrey;
+  intrinsic-size: 77px 33px;
+  flex-grow: 1;
+}
+</style>
+
+<div id=flex>
+  <div class=item id=one></div>
+  <div class=item id=two></div>
+  <div class=item id=three></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-017-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-017-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-017.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: replaced content (vertical-lr)</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-017-ref.html">
+<meta name="assert" content="intrinsic-size specifies physical dimensions on replaced content">
+
+<style>
+body {
+  writing-mode: vertical-lr;
+}
+#target {
+  intrinsic-size: 100px 200px;
+  inline-size: min-content;
+  block-size: auto;
+}
+</style>
+
+<img id=target src="resources/dice.png"></img>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-018-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-018-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-018.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: sized div</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-018-ref.html">
+<meta name="assert" content="width / height ignore intrinsic-size">
+
+<style>
+#target {
+  background: lightblue;
+  width: 55px;
+  height: 66px;
+  intrinsic-size: 111px 222px;
+}
+</style>
+
+<div id=target></div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-019-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-019-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-019.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: div with fit-content width</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-019-ref.html">
+<meta name="assert" content="div is sized to intrinsic-width when width is fit-content">
+
+<style>
+#target {
+  background: lightblue;
+  intrinsic-size: 111px 222px;
+  width: fit-content;
+}
+</style>
+
+<div id=target></div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-020-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-020-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-020.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: replaced content (min-content)</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-020-ref.html">
+<meta name="assert" content="replaced content is sized to intrinsic-width when width is min-content">
+
+<style>
+#target {
+  intrinsic-size: 100px 200px;
+  inline-size: min-content;
+  block-size: auto;
+}
+</style>
+
+<img id=target src="resources/dice.png"></img>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-021-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-021-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-021.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: flex row, flex height based on children</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-021-ref.html">
+<meta name="assert" content="flex container is sized by the largest intrinsic-height of content, even with align-self: stretch">
+
+<style>
+#flex {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  width: 250px;
+}
+.item {
+  border: 1px solid black;
+}
+#one {
+  background: lightblue;
+  intrinsic-size: 55px 21px;
+}
+#two {
+  background: lightgreen;
+  intrinsic-size: 66px 42px;
+}
+#three {
+  background: lightgrey;
+  align-self: stretch;
+  intrinsic-size: 77px 63px;
+}
+</style>
+
+<div id=flex>
+  <div class=item id=one></div>
+  <div class=item id=two></div>
+  <div class=item id=three></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-022-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-022-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-022.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid definite size</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-022-ref.html">
+<meta name="assert" content="grid container is sized by intrinsic-size, even if definite track sizes overflow">
+
+<style>
+#grid {
+  border: 3px solid black;
+  display: grid;
+  grid-template: 55px 66px / 77px 88px;
+  intrinsic-size: 70px 80px;
+  width: max-content;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.item {
+  background: lightgreen;
+  opacity: 0.5;
+  height: 100%;
+}
+</style>
+
+<div id=grid>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-023-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-023-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-023.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid indefinite size</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-023-ref.html">
+<meta name="assert" content="grid container is sized by intrinsic-size, with fr-tracks using that space">
+
+<style>
+#grid {
+  border: 3px solid black;
+  display: grid;
+  grid-template: 1fr 2fr / 3fr 4fr;
+  intrinsic-size: 70px 80px;
+  width: max-content;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.item {
+  background: lightgreen;
+  height: 100%;
+}
+</style>
+
+<div id=grid>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-024-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-024-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-024.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid definite size, large size</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-024-ref.html">
+<meta name="assert" content="intrinsic-size sizes grid container, even if definite tracks are smaller">
+
+<style>
+#grid {
+  border: 3px solid black;
+  display: grid;
+  grid-template: 55px 66px / 77px 88px;
+  intrinsic-size: 200px 300px;
+  width: max-content;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.item {
+  background: lightgreen;
+  opacity: 0.5;
+  height: 100%;
+}
+</style>
+
+<div id=grid>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-025-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-025-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-025.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid indefinite size, auto-fit</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-025-ref.html">
+<meta name="assert" content="definite size auto-fit uses intrinsic-size for the available space">
+
+<style>
+.grid {
+  border: 3px solid black;
+  display: grid;
+  intrinsic-size: 70px 80px;
+  width: max-content;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.one {
+  grid-template: repeat(auto-fit, 10px) / 3fr 4fr;
+}
+.two {
+  grid-template: 1fr 2fr / repeat(auto-fit, 15px);
+}
+.three {
+  grid-template: repeat(auto-fit, 10px) / repeat(auto-fit, 15px);
+}
+
+.item {
+  background: green;
+  height: 100%;
+}
+</style>
+
+<div class="grid one">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid two">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid three">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-026-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-026-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-026.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid auto-fit, min- max- size interactions</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-026-ref.html">
+<meta name="assert" content="auto-fit columns, with intrinsic-size interacting with min- and max- width">
+
+<style>
+.grid {
+  display: inline-grid;
+  border: 1px solid black;
+  grid-template-columns: repeat(auto-fit, 100px);
+}
+.one {
+  intrinsic-width: 100px;
+  min-width: 200px;
+}
+.two {
+  intrinsic-width: 200px;
+  min-width: 100px;
+}
+.three {
+  intrinsic-width: 100px;
+  min-width: 200px;
+  max-width: 150px;
+}
+.four {
+  intrinsic-width: 200px;
+  min-width: 100px;
+  max-width: 150px;
+}
+.item {
+  background: green;
+  height: 100%;
+}
+</style>
+
+<p>min-width larger than intrinsic-width:
+<div class="grid one">
+  <div class="item">one</div>
+  <div class="item">two</div>
+</div>
+
+<p>min-width smaller than intrinsic-width:
+<div class="grid two">
+  <div class="item">one</div>
+  <div class="item">two</div>
+</div>
+
+<p>max-width ignored since min-width is larger:
+<div class="grid three">
+  <div class="item">one</div>
+  <div class="item">two</div>
+</div>
+
+<p>min-width shrinks grid since it overrides intrinsic-width:
+<div class="grid four">
+  <div class="item">one</div>
+  <div class="item">two</div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-001-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-001-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-001.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: intrinsic-width auto</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-auto-001-ref.html">
+<meta name="assert" content="intrinsic-size auto is treated as 0 when overflow is not 'visible'">
+
+<style>
+div {
+  width: max-content;
+  intrinsic-size: auto 111px;
+  border: 1px solid black;
+}
+#one {
+  overflow: hidden;
+}
+#two {
+  overflow-x: scroll;
+}
+/* We can't have overflow-x: visible without overflow-y not being visible and vice versa
+   (see Computed value in https://www.w3.org/TR/css-overflow-3/#overflow-properties).
+   Hence, we set both overflow directions.
+*/
+#three {
+  overflow: visible;
+}
+</style>
+
+<div id=one>Lorem ipsum</div>
+<br>
+<div id=two>Lorem ipsum</div>
+<br>
+<div id=three>Lorem ipsum</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-002-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-002-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-002.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: intrinsic-width auto</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-auto-002-ref.html">
+<meta name="assert" content="intrinsic-size auto is treated as 0 when overflow is not 'visible'">
+
+<style>
+div {
+  width: max-content;
+  intrinsic-size: 111px auto;
+  border: 1px solid black;
+}
+#one {
+  overflow: hidden;
+}
+#two {
+  overflow-y: scroll;
+}
+/* We can't have overflow-x: visible without overflow-y not being visible and vice versa
+   (see Computed value in https://www.w3.org/TR/css-overflow-3/#overflow-properties).
+   Hence, we set both overflow directions.
+*/
+#three {
+  overflow: visible;
+}
+</style>
+
+<div id=one>Lorem ipsum</div>
+<br>
+<div id=two>Lorem ipsum</div>
+<br>
+<div id=three>Lorem ipsum</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-auto-003-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-003-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-auto-003.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: replaced content with auto</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-auto-003-ref.html">
+<meta name="assert" content="intrinsic-size auto is treated as 0 when overflow is not 'visible'">
+
+<style>
+img {
+  border: 1px solid black;
+}
+#target1 {
+  intrinsic-size: auto 200px;
+}
+#target2 {
+  intrinsic-size: 100px auto;
+}
+#target3 {
+  intrinsic-size: auto 200px;
+  overflow: hidden;
+}
+#target4 {
+  intrinsic-size: 100px auto;
+  overflow: hidden;
+}
+</style>
+
+<img id=target1 src="resources/dice.png"></img>
+<img id=target2 src="resources/dice.png"></img>
+<img id=target3 src="resources/dice.png"></img>
+<img id=target4 src="resources/dice.png"></img>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-001-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-001-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-001.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: intrinsic-width legacy</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-001-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+#target {
+  background: lightblue;
+  width: max-content;
+  intrinsic-size: legacy 222px;
+}
+</style>
+
+<div id=target>Lorem ipsum</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-002-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-002-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-002.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: flex with legacy intrinsic dimensions</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-002-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+#flex {
+  display: flex;
+  flex-direction: column;
+  height: 500px;
+}
+.item {
+  width: max-content;
+}
+#one {
+  background: lightblue;
+  intrinsic-size: legacy 222px;
+  flex-grow: 3;
+}
+#two {
+  background: lightgreen;
+  intrinsic-size: 333px legacy;
+  flex-grow: 2;
+}
+#three {
+  background: lightgrey;
+  intrinsic-size: legacy 444px;
+  flex-grow: 1;
+}
+</style>
+
+<div id=flex>
+  <div class=item id=one>Lorem ipsum</div>
+  <div class=item id=two>dolor sit amet</div>
+  <div class=item id=three>consectetur adipiscing elit</div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-003-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-003-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-003.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: select multiple with legacy sizing</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-003-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+#one {
+  intrinsic-size: legacy 222px;
+}
+#two {
+  intrinsic-size: 111px legacy;
+  overflow: visible;
+}
+</style>
+
+<select multiple id=one></select>
+<select multiple id=two></select>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-004-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-004-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-004.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: replaced content with legacy</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-004-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+img {
+  border: 1px solid black;
+}
+#target1 {
+  intrinsic-size: legacy 200px;
+}
+#target2 {
+  intrinsic-size: 100px legacy;
+}
+</style>
+
+<img id=target1 src="resources/dice.png"></img>
+<img id=target2 src="resources/dice.png"></img>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-005-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-005-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-005.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid definite size with legacy</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-005-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+.grid {
+  border: 3px solid black;
+  display: grid;
+  grid-template: 55px 66px / 77px 88px;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.one {
+  intrinsic-size: legacy 80px;
+  width: 70px;
+}
+.two {
+  intrinsic-size: 70px legacy;
+  height: 80px;
+  width: min-content;
+}
+.item {
+  background: lightgreen;
+  opacity: 0.5;
+  height: 100%;
+}
+</style>
+
+<div class="grid one">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid two">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-006-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-006-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-006.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid indefinite size with legacy</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-006-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+.grid {
+  border: 3px solid black;
+  display: grid;
+  grid-template: 1fr 2fr / 3fr 4fr;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.one {
+  intrinsic-size: legacy 80px;
+  width: 70px;
+}
+.two {
+  intrinsic-size: 70px legacy;
+  width: min-content;
+  height: 80px;
+}
+.item {
+  background: lightgreen;
+  height: 100%;
+}
+</style>
+
+<div class="grid one">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid two">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-007-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-007-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-007.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid definite size, large size with legacy</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-007-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+.grid {
+  border: 3px solid black;
+  display: grid;
+  grid-template: 55px 66px / 77px 88px;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.one {
+  intrinsic-size: legacy 300px;
+  width: 200px;
+}
+.two {
+  intrinsic-size: 200px legacy;
+  width: max-content;
+  height: 300px;
+}
+.item {
+  background: lightgreen;
+  height: 100%;
+}
+</style>
+
+<div class="grid one">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid two">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/intrinsic-size-with-legacy-008-ref.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-008-ref.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-sizing/intrinsic-size/intrinsic-size-with-legacy-008.html
@@ -0,0 +1,87 @@
+<!doctype html>
+<meta charset="utf8">
+<title>CSS intrinsic-size: grid indefinite size, auto-fit with legacy</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override">
+<link rel="match" href="intrinsic-size-with-legacy-008-ref.html">
+<meta name="assert" content="intrinsic-size legacy is treated the same as if it was not specified.">
+
+<style>
+.grid {
+  border: 3px solid black;
+  display: grid;
+  background: lightblue;
+  grid-gap: 5px;
+}
+.one {
+  grid-template: repeat(auto-fit, 10px) / 3fr 4fr;
+}
+.two {
+  grid-template: 1fr 2fr / repeat(auto-fit, 15px);
+}
+.three {
+  grid-template: repeat(auto-fit, 10px) / repeat(auto-fit, 15px);
+}
+.width {
+  intrinsic-size: 70px legacy;
+  width: max-content;
+  height: 80px;
+}
+.height {
+  intrinsic-size: legacy 80px;
+  width: 70px;
+}
+.item {
+  background: green;
+  height: 100%;
+}
+</style>
+
+<div class="grid one width">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid two width">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid three width">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid one height">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid two height">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
+<div class="grid three height">
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+  <div class=item></div>
+</div>
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-block-size-computed.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-block-size-computed.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-block-size-invalid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-block-size-invalid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-block-size-valid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-block-size-valid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-height-computed.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-height-computed.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-height-invalid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-height-invalid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-height-valid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-height-valid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-inline-size-computed.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-inline-size-computed.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-inline-size-invalid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-inline-size-invalid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-inline-size-valid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-inline-size-valid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-computed.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-computed.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-invalid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-invalid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-sets-computed-dimensions.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-sets-computed-dimensions.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-size-valid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-size-valid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-width-computed.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-width-computed.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-width-invalid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-width-invalid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/parsing/intrinsic-width-valid.html
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/parsing/intrinsic-width-valid.html
rename from testing/web-platform/tests/css/css-intrinsic-size/resources/dice.png
rename to testing/web-platform/tests/css/css-sizing/intrinsic-size/resources/dice.png