diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json index 0b9ffca88eb..87033e0c56b 100644 --- a/tests/wpt/meta/MANIFEST.json +++ b/tests/wpt/meta/MANIFEST.json @@ -294185,6 +294185,21 @@ {} ] ], + "vh-update-and-transition-in-subframe.html": [ + "5e73ffc31153f0542de6fa4da37ef528d6866cd9", + [ + null, + [ + [ + "/css/css-values/reference/vh-update-and-transition-in-subframe-ref.html", + "==" + ] + ], + { + "timeout": "long" + } + ] + ], "vh-zero-support.html": [ "1c1bcd1761a2ffccfc1a92a10ddf860712606fa1", [ @@ -294198,21 +294213,6 @@ {} ] ], - "vh_not_refreshing_on_chrome.html": [ - "e5606a0cb751554602c2d108840300973e92c734", - [ - null, - [ - [ - "/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html", - "==" - ] - ], - { - "timeout": "long" - } - ] - ], "viewport-unit-011.html": [ "055f3d1fd2d716a68d857738493815c8772bef06", [ @@ -440473,12 +440473,12 @@ "cfa9e8d02d48436ee1c311da7c7bd65b0f4291cf", [] ], - "vh_not_refreshing_on_chrome-ref.html": [ - "279d1c69b9f7fbe60edb55b7e8a5d507eda24936", + "vh-update-and-transition-in-subframe-iframe-ref.html": [ + "bc8216835883bc0314d76cb10f287f5202e3dc03", [] ], - "vh_not_refreshing_on_chrome_iframe-ref.html": [ - "5e35f6261e266be2981ae79038e464ac354cc8ef", + "vh-update-and-transition-in-subframe-ref.html": [ + "ab068dfaf87773ebfaefbb3ab9d48f251760bc60", [] ], "viewport-unit-011-ref.html": [ @@ -440740,10 +440740,6 @@ "vh-support-transform-translate-iframe.html": [ "f0b1b54c12d35da74bf19849612574a20339fe6a", [] - ], - "vh_not_refreshing_on_chrome_iframe.html": [ - "8d8e9b49d4aa3d9804a176852288e32ccaaa47d8", - [] ] }, "urls": { @@ -440762,6 +440758,10 @@ ] } }, + "vh-update-and-transition-in-subframe-iframe.html": [ + "61831f42f7d6ca1efe2e9534366f4b91da2ca155", + [] + ], "viewport-units-001-print-ref.html": [ "bc914522c7fcf556c69ba56d2d0ba792d7e92b89", [] @@ -474935,7 +474935,7 @@ ] }, "lint.ignore": [ - "00fb7fd020192843abd6ba46baabd86ca0ce129f", + "4bf325500491b21f1556a365e14ebf1c96c9a516", [] ], "loading": { diff --git a/tests/wpt/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini b/tests/wpt/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini deleted file mode 100644 index 61c7e8e9d50..00000000000 --- a/tests/wpt/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[vh_not_refreshing_on_chrome.html] - expected: TIMEOUT diff --git a/tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html b/tests/wpt/tests/css/css-values/reference/vh-update-and-transition-in-subframe-iframe-ref.html similarity index 54% rename from tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html rename to tests/wpt/tests/css/css-values/reference/vh-update-and-transition-in-subframe-iframe-ref.html index 5e35f6261e2..bc821683588 100644 --- a/tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html +++ b/tests/wpt/tests/css/css-values/reference/vh-update-and-transition-in-subframe-iframe-ref.html @@ -2,23 +2,39 @@ - - CSS Reference File + CSS Reference File - - @@ -33,30 +49,13 @@ diff --git a/tests/wpt/tests/css/css-values/reference/vh-update-and-transition-in-subframe-ref.html b/tests/wpt/tests/css/css-values/reference/vh-update-and-transition-in-subframe-ref.html new file mode 100644 index 00000000000..ab068dfaf87 --- /dev/null +++ b/tests/wpt/tests/css/css-values/reference/vh-update-and-transition-in-subframe-ref.html @@ -0,0 +1,59 @@ + + + + + CSS Reference File + + + + + + + + + + diff --git a/tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html b/tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html deleted file mode 100644 index 279d1c69b9f..00000000000 --- a/tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - CSS Reference File - - - - - - - - - - - - - - diff --git a/tests/wpt/tests/css/css-values/support/vh_not_refreshing_on_chrome_iframe.html b/tests/wpt/tests/css/css-values/support/vh_not_refreshing_on_chrome_iframe.html deleted file mode 100644 index 8d8e9b49d4a..00000000000 --- a/tests/wpt/tests/css/css-values/support/vh_not_refreshing_on_chrome_iframe.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - CSS Values and Units Test: vh-based dimension doesn't change when the element other dimension doesn't change. - - - - - - -

- All boxes should end up the same size. The green box is the reference one. -

- -
-
-
-
- - - - - diff --git a/tests/wpt/tests/css/css-values/vh-update-and-transition-in-subframe-iframe.html b/tests/wpt/tests/css/css-values/vh-update-and-transition-in-subframe-iframe.html new file mode 100644 index 00000000000..61831f42f7d --- /dev/null +++ b/tests/wpt/tests/css/css-values/vh-update-and-transition-in-subframe-iframe.html @@ -0,0 +1,91 @@ + + + + + + + + +

+ All boxes should end up the same size. The green box is the reference one. +

+ +
+
+
+
+ + + + + diff --git a/tests/wpt/tests/css/css-values/vh-update-and-transition-in-subframe.html b/tests/wpt/tests/css/css-values/vh-update-and-transition-in-subframe.html new file mode 100644 index 00000000000..5e73ffc3115 --- /dev/null +++ b/tests/wpt/tests/css/css-values/vh-update-and-transition-in-subframe.html @@ -0,0 +1,64 @@ + + + + + + CSS Values and Units Test: Ensure vh-based dimensions update and transition when used in subframe that change size. + + + + + + + + + + + + + + + diff --git a/tests/wpt/tests/css/css-values/vh_not_refreshing_on_chrome.html b/tests/wpt/tests/css/css-values/vh_not_refreshing_on_chrome.html deleted file mode 100644 index e5606a0cb75..00000000000 --- a/tests/wpt/tests/css/css-values/vh_not_refreshing_on_chrome.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - CSS Values and Units Test: vh-based dimension doesn't change when the element's other dimension doesn't change. - - - - - - - - - - - - - - - - - - - - diff --git a/tests/wpt/tests/lint.ignore b/tests/wpt/tests/lint.ignore index 00fb7fd0201..4bf32550049 100644 --- a/tests/wpt/tests/lint.ignore +++ b/tests/wpt/tests/lint.ignore @@ -480,10 +480,10 @@ SET TIMEOUT: css/css-transitions/events-007.html SET TIMEOUT: css/css-transitions/support/generalParallelTest.js SET TIMEOUT: css/css-transitions/support/runParallelAsyncHarness.js SET TIMEOUT: css/css-transitions/transitioncancel-001.html -SET TIMEOUT: css/css-values/reference/vh_not_refreshing_on_chrome-ref.html -SET TIMEOUT: css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html -SET TIMEOUT: css/css-values/vh_not_refreshing_on_chrome.html -SET TIMEOUT: css/css-values/support/vh_not_refreshing_on_chrome_iframe.html +SET TIMEOUT: css/css-values/reference/vh-update-and-transition-in-subframe-ref.html +SET TIMEOUT: css/css-values/reference/vh-update-and-transition-in-subframe-iframe-ref.html +SET TIMEOUT: css/css-values/vh-update-and-transition-in-subframe.html +SET TIMEOUT: css/css-values/vh-update-and-transition-in-subframe-iframe.html SET TIMEOUT: css/css-writing-modes/orthogonal-parent-shrink-to-fit-001.html SET TIMEOUT: css/css-writing-modes/orthogonal-parent-shrink-to-fit-001a.html SET TIMEOUT: css/css-writing-modes/orthogonal-parent-shrink-to-fit-001b.html