Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (283493 => 283494)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-10-04 13:16:56 UTC (rev 283493)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-10-04 13:57:48 UTC (rev 283494)
@@ -1,3 +1,20 @@
+2021-10-04 Sergio Villar Senin <svil...@igalia.com>
+
+ [css-flexbox] Resync WPT tests
+ https://bugs.webkit.org/show_bug.cgi?id=231164
+
+ Reviewed by Rob Buis.
+
+ Imported some tests after being fixed upstream. Also fetched new ones.
+
+ * web-platform-tests/css/css-flexbox/parsing/flex-grow-computed-expected.txt:
+ * web-platform-tests/css/css-flexbox/parsing/flex-grow-computed.html:
+ * web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed-expected.txt:
+ * web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed.html:
+ * web-platform-tests/css/css-flexbox/text-as-flexitem-size-001-expected.txt: Added.
+ * web-platform-tests/css/css-flexbox/text-as-flexitem-size-001.html: Added.
+ * web-platform-tests/css/css-flexbox/w3c-import.log:
+
2021-10-04 Ziran Sun <z...@igalia.com>
[css-grid] Resync web-platform-tests/css/css-grid tests from upstream
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed-expected.txt (283493 => 283494)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed-expected.txt 2021-10-04 13:16:56 UTC (rev 283493)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed-expected.txt 2021-10-04 13:57:48 UTC (rev 283494)
@@ -1,6 +1,6 @@
PASS Property flex-grow value '1'
-FAIL Property flex-grow value '2.34e+06' assert_equals: expected "2.34e+06" but got "2340000"
-FAIL Property flex-grow value '6.78e+08' assert_equals: expected "6.78e+08" but got "678000000"
+PASS Property flex-grow value '2.34e+06'
+PASS Property flex-grow value '6.78e+08'
PASS Property flex-grow value '0'
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed.html (283493 => 283494)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed.html 2021-10-04 13:16:56 UTC (rev 283493)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed.html 2021-10-04 13:57:48 UTC (rev 283494)
@@ -13,8 +13,8 @@
<div id="target"></div>
<script>
test_computed_value("flex-grow", "1");
-test_computed_value("flex-grow", "2.34e+06");
-test_computed_value("flex-grow", "6.78e+08");
+test_computed_value("flex-grow", "2.34e+06", ["2.34e+06", "2340000"]);
+test_computed_value("flex-grow", "6.78e+08", ["6.78e+08", "678000000"]);
test_computed_value("flex-grow", "0");
</script>
</body>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed-expected.txt (283493 => 283494)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed-expected.txt 2021-10-04 13:16:56 UTC (rev 283493)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed-expected.txt 2021-10-04 13:57:48 UTC (rev 283494)
@@ -1,6 +1,6 @@
PASS Property flex-shrink value '1'
-FAIL Property flex-shrink value '2.34e+06' assert_equals: expected "2.34e+06" but got "2340000"
-FAIL Property flex-shrink value '6.78e+08' assert_equals: expected "6.78e+08" but got "678000000"
+PASS Property flex-shrink value '2.34e+06'
+PASS Property flex-shrink value '6.78e+08'
PASS Property flex-shrink value '0'
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed.html (283493 => 283494)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed.html 2021-10-04 13:16:56 UTC (rev 283493)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed.html 2021-10-04 13:57:48 UTC (rev 283494)
@@ -13,8 +13,8 @@
<div id="target"></div>
<script>
test_computed_value("flex-shrink", "1");
-test_computed_value("flex-shrink", "2.34e+06");
-test_computed_value("flex-shrink", "6.78e+08");
+test_computed_value("flex-shrink", "2.34e+06", ["2.34e+06", "2340000"]);
+test_computed_value("flex-shrink", "6.78e+08", ["6.78e+08", "678000000"]);
test_computed_value("flex-shrink", "0");
</script>
</body>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001-expected.txt (0 => 283494)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001-expected.txt 2021-10-04 13:57:48 UTC (rev 283494)
@@ -0,0 +1,97 @@
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+xx xxx
+
+xx
+
+
+PASS .flexbox > div 1
+PASS .flexbox > div 2
+PASS .flexbox > div 3
+PASS .flexbox > div 4
+PASS .flexbox > div 5
+PASS .flexbox > div 6
+PASS .flexbox > div 7
+PASS .flexbox > div 8
+PASS .flexbox > div 9
+PASS .flexbox > div 10
+PASS .flexbox > div 11
+PASS .flexbox > div 12
+PASS .flexbox > div 13
+PASS .flexbox > div 14
+PASS .flexbox > div 15
+PASS .flexbox > div 16
+PASS .flexbox > div 17
+PASS .flexbox > div 18
+
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001.html (0 => 283494)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001.html 2021-10-04 13:57:48 UTC (rev 283494)
@@ -0,0 +1,200 @@
+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+
+ This test is a text-based variant of text-as-flexitem-size-001.
+ (Not sure if all these variants are needed without an aspect ratio,
+ but seemed best to keep it in parallel as much as reasonable.)
+-->
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>
+ CSS Test: Testing how explicit main-size & cross-size constraints
+ influence sizing on non-stretched flex item containing text.
+ </title>
+ <link rel="author" title="Daniel Holbert" href=""
+ <link rel="author" title="David Grogan" href=""
+ <link rel="author" title="Elika J. Etemad" href=""
+ <link rel="help" href=""
+ <link rel="help" href=""
+ <style>
+ @import "/fonts/ahem.css";
+ .flexbox {
+ display: flex;
+ flex-direction: row;
+ border: 1px solid black;
+ margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
+ width: 80px;
+ height: 50px;
+
+ justify-content: flex-start;
+ align-items: flex-start;
+
+ float: left; /* For testing in "rows" */
+ }
+ br { clear: both; }
+
+ .flexbox > * {
+ /* Disable "min-width:auto"/"min-height:auto" to focus purely on
+ later channels of influence. */
+ min-width: 0;
+ min-height: 0;
+ background: orange;
+ }
+
+ .flexbox p {
+ font: 10px/1 Ahem, monospace;
+ margin: 0.5em;
+ color: #0006;
+ }
+ /* Depending on wrapping, flex item content will be 35px or 45px tall,
+ min-content width = 40px and max-content width = 70px */
+ </style>
+ <script src=""
+ <script src=""
+ <script src=""
+ </head>
+ <body _onload_="checkLayout('.flexbox > div')">
+ <!-- Row 1: no special sizing: -->
+ <div class="flexbox">
+ <div data-expected-width="70" data-expected-height="35">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox" style="width: 50px">
+ <div data-expected-width="50" data-expected-height="45">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox" style="width: 20px">
+ <div data-expected-width="20" data-expected-height="45">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <br>
+
+ <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
+ <div class="flexbox">
+ <div style="width: 30px"
+ data-expected-width="30" data-expected-height="45">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="height: 30px"
+ data-expected-width="70" data-expected-height="30">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="flex: 0 0 30px"
+ data-expected-width="30" data-expected-height="45">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <br>
+
+ <!-- Row 3: min main-size OR min cross-size, or both -->
+ <div class="flexbox">
+ <div style="min-width: 75px"
+ data-expected-width="75" data-expected-height="35">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="min-height: 40px"
+ data-expected-width="70" data-expected-height="40">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="min-width: 75px; min-height: 40px"
+ data-expected-width="75" data-expected-height="40">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <br>
+
+ <!-- Row 4: max main-size OR max cross-size, or both -->
+ <div class="flexbox">
+ <div style="max-width: 20px"
+ data-expected-width="20" data-expected-height="45">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="max-height: 20px"
+ data-expected-width="70" data-expected-height="20">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="max-width: 20px; max-height: 20px"
+ data-expected-width="20" data-expected-height="20">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <br>
+
+ <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
+ <div class="flexbox">
+ <div style="min-width: 70px; max-height: 20px"
+ data-expected-width="70" data-expected-height="20">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="max-width: 20px; min-height: 50px"
+ data-expected-width="20" data-expected-height="50">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <br>
+
+ <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
+ <div class="flexbox">
+ <div style="min-width: 70px; height: 20px"
+ data-expected-width="70" data-expected-height="20">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="width: 40px; max-height: 20px"
+ data-expected-width="40" data-expected-height="20">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="max-width: 20px; height: 20px"
+ data-expected-width="20" data-expected-height="20">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ <div class="flexbox">
+ <div style="width: 20px; min-height: 20px"
+ data-expected-width="20" data-expected-height="45">
+ <p>xx xxx</p>
+ <p>xx</p>
+ </div>
+ </div>
+ </body>
+</html>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/w3c-import.log (283493 => 283494)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/w3c-import.log 2021-10-04 13:16:56 UTC (rev 283493)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/w3c-import.log 2021-10-04 13:57:48 UTC (rev 283494)
@@ -1734,6 +1734,7 @@
/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/table-with-infinite-max-intrinsic-width-expected.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/table-with-infinite-max-intrinsic-width.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/table-with-percent-intrinsic-width.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-overflow-on-flexbox-001-expected.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/text-overflow-on-flexbox-001.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/whitespace-in-flexitem-001-expected.html
