diff options
Diffstat (limited to 'tests/wpt/css-tests/css-flexbox-1_dev')
73 files changed, 1302 insertions, 503 deletions
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm index d88228519f1..05dc67af614 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm @@ -13,7 +13,7 @@ <body> <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1> - <h2>Flex Items (72 tests)</h2> + <h2>Flex Items (71 tests)</h2> <table width="100%"> <col id="test-column"> <col id="refs-column"> @@ -31,7 +31,7 @@ <tr><th colspan="4" scope="rowgroup"> <a href="#s4">+</a> <a href="https://www.w3.org/TR/css-flexbox-1/#flex-items">4 Flex Items</a></th></tr> - <!-- 24 tests --> + <!-- 23 tests --> <tr id="flex-flexitem-childmargin-4" class=""> <td> <a href="flex-flexitem-childmargin.htm">flex-flexitem-childmargin</a></td> @@ -62,20 +62,12 @@ <td>Testing that we gracefully handle cases where two anonymous flex items become adjacent due to "order" reordering </td> </tr> - <tr id="flexbox-table-fixup-001a-4" class=""> + <tr id="flexbox-table-fixup-001-4" class=""> <td> - <a href="flexbox-table-fixup-001a.htm">flexbox-table-fixup-001a</a></td> + <a href="flexbox-table-fixup-001.htm">flexbox-table-fixup-001</a></td> <td><a href="reference/flexbox-table-fixup-001-ref.htm">=</a> </td> <td></td> - <td>Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item - </td> - </tr> - <tr id="flexbox-table-fixup-001b-4" class=""> - <td> - <a href="flexbox-table-fixup-001b.htm">flexbox-table-fixup-001b</a></td> - <td><a href="reference/flexbox-table-fixup-001-ref.htm">=</a> </td> - <td></td> - <td>Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items + <td>Testing that table cells in a flex container get blockified and each form their own flex item </td> </tr> <tr id="flexbox-whitespace-handling-001a-4" class=""> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm index cefdf343979..3b7f6ecf69e 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm @@ -13,7 +13,7 @@ <body> <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1> - <h2>Flex Layout Algorithm (62 tests)</h2> + <h2>Flex Layout Algorithm (68 tests)</h2> <table width="100%"> <col id="test-column"> <col id="refs-column"> @@ -517,7 +517,23 @@ <!-- 0 tests --> </tbody> <tbody id="s9.2.#hypothetical-main-size"> - <!-- 0 tests --> + <!-- 2 tests --> + <tr id="flex-aspect-ratio-img-column-001-9.2.#hypothetical-main-size" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-001.htm">flex-aspect-ratio-img-column-001</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-001-9.2.#hypothetical-main-size" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-001.htm">flex-aspect-ratio-img-row-001</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + </td> + </tr> </tbody> <tbody id="s9.3"> <tr><th colspan="4" scope="rowgroup"> @@ -613,7 +629,51 @@ <!-- 0 tests --> </tbody> <tbody id="s9.4.#algo-cross-item"> - <!-- 0 tests --> + <!-- 4 tests --> + <tr id="flex-aspect-ratio-img-column-002-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-002.htm">flex-aspect-ratio-img-column-002</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a height is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-column-003-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-003.htm">flex-aspect-ratio-img-column-003</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-002-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-002.htm">flex-aspect-ratio-img-row-002</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a width is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-003-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-003.htm">flex-aspect-ratio-img-row-003</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified</li> + </ul> + </td> + </tr> </tbody> <tbody id="s9.4.#algo-cross-line"> <!-- 0 tests --> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap-reverse.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap-reverse.htm index 9a2f834ced2..24c1e7c41fc 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap-reverse.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap-reverse.htm @@ -31,19 +31,19 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <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 class="item">３</div> - <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 class="item">２</div> - <div class="item">ｇ</div> + <div class="item">ｓ</div> <div class="item">７</div> <div class="item">ｄ</div> <div class="item">４</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap.htm index 160c94d313a..9c2815f90e9 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse-wrap.htm @@ -31,19 +31,19 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <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 class="item">１</div> - <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 class="item">２</div> - <div class="item">ｉ</div> + <div class="item">ｕ</div> <div class="item">９</div> <div class="item">ｆ</div> <div class="item">６</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse.htm index 4a59313016a..2c1cbe5f43d 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-reverse.htm @@ -28,7 +28,7 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> <div class="item">７８９</div> <div class="item">ｄｅｆ</div> <div class="item">４５６</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap-reverse.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap-reverse.htm index 45069188142..9bcdc91e830 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap-reverse.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap-reverse.htm @@ -36,19 +36,19 @@ <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 class="item">ｂ</div> <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 class="item">ａ</div> <div class="item">４</div> <div class="item">ｄ</div> <div class="item">７</div> - <div class="item">ｇ</div> + <div class="item">ｓ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap.htm index 014b4279edc..bf7fe66d3f8 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column-wrap.htm @@ -36,19 +36,19 @@ <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 class="item">ｂ</div> <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 class="item">ｃ</div> <div class="item">６</div> <div class="item">ｆ</div> <div class="item">９</div> - <div class="item">ｉ</div> + <div class="item">ｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column.htm index f1e3353b7c3..27df3e49787 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/css-flexbox-column.htm @@ -33,7 +33,7 @@ <div class="item">４５６</div> <div class="item">ｄｅｆ</div> <div class="item">７８９</div> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-001.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-001.htm new file mode 100644 index 00000000000..c8076d2b50d --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-001.htm @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc."> + <link href="https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size" rel="help"> + <link href="reference/ref-filled-green-100px-square.htm" rel="match"> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + width: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green"> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-002.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-002.htm new file mode 100644 index 00000000000..b5422282b5c --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-002.htm @@ -0,0 +1,41 @@ +<!DOCTYPE html> +<html><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc."> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help"> + <link href="reference/ref-filled-green-100px-square.htm" rel="match"> + <meta content="Test that we compute the correct aspect-ratio based cross size when a height is specified" name="assert"> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + height: 100px; + align-self: flex-start; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green"> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-003.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-003.htm new file mode 100644 index 00000000000..2c8cec157f0 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-column-003.htm @@ -0,0 +1,41 @@ +<!DOCTYPE html> +<html><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc."> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help"> + <link href="reference/ref-filled-green-100px-square.htm" rel="match"> + <meta content="Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified" name="assert"> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + flex-basis: 100px; + align-self: flex-start; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green"> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-001.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-001.htm new file mode 100644 index 00000000000..a481e4c10ff --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-001.htm @@ -0,0 +1,38 @@ +<!DOCTYPE html> +<html><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc."> + <link href="https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size" rel="help"> + <link href="reference/ref-filled-green-100px-square.htm" rel="match"> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + height: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green"> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-002.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-002.htm new file mode 100644 index 00000000000..5ab342bdda3 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-002.htm @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc."> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help"> + <link href="reference/ref-filled-green-100px-square.htm" rel="match"> + <meta content="Test that we compute the correct aspect-ratio based cross size when a width is specified" name="assert"> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + width: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green"> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-003.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-003.htm new file mode 100644 index 00000000000..134fa89f80e --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flex-aspect-ratio-img-row-003.htm @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc."> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help"> + <link href="reference/ref-filled-green-100px-square.htm" rel="match"> + <meta content="Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified" name="assert"> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + flex-basis: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green"> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-table-fixup-001a.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-table-fixup-001.htm index 8bc0d0f07a0..99782a527f1 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-table-fixup-001a.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-table-fixup-001.htm @@ -3,13 +3,14 @@ Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ --><!-- - Testcase with table parts inside of a flex container, triggering - table-fixup. We use justify-content:space-between to stick packing + Testcase with table parts inside of a flex container, which should *not* + trigger table-fixup. We use justify-content:space-between to stick packing space between flex items, so that we can verify that e.g. a contiguous - run of <td>s will end up in the same flex item (wrapped in a table). + run of <td>s will each be blockified & form its own flex item (instead of + being aggregated into a single table & single flex item). --><html> <head> - <title>CSS Test: Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item</title> + <title>CSS Test: Testing that table cells in a flex container get blockified and each form their own flex item</title> <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"> <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"> <link rel="match" href="reference/flexbox-table-fixup-001-ref.htm"> @@ -21,12 +22,10 @@ justify-content: space-around; } - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> td { - padding-top: 0px; - padding-bottom: 0px; + /* Remove any default padding for td elements, so we can compare them + easily against blocks in the reference case. */ + padding: 0px; } .a { @@ -46,16 +45,16 @@ </style> </head> <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> + <!-- The adjacent table-parts in each example below should *not* be + grouped into the same flex item. --> + <!-- 2 adjacent table cells --> <div class="flexbox"><td class="a">cell1</td><td class="b">cell2</td></div> - <!-- Table cell followed by tbody (they end up in the same table) --> + <!-- Table cell followed by tbody --> <div class="flexbox"><td class="a">cell1</td><tbody class="b">t</tbody></div> - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <!-- Note: We use "space-between" (instead of "space-around") here because - it makes the math cleaner. (100px split 2 ways instead of 3 ways.) --> - <div class="flexbox" style="justify-content: space-between"><td></td><div class="c">div</div><td class="b">cell1</td></div> + <!-- Empty table cell (ends up occupying 2px of width), followed by + nonempty table cell.--> + <div class="flexbox"><td></td><td class="b">cell1</td></div> </body> </html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-table-fixup-001b.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-table-fixup-001b.htm deleted file mode 100644 index 5a12805439f..00000000000 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-table-fixup-001b.htm +++ /dev/null @@ -1,69 +0,0 @@ -<!DOCTYPE html> -<!-- - Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ ---><!-- - Testcase with table parts inside of a flex container, triggering - table-fixup. We use justify-content:space-between to stick packing - space between flex items, so that we can verify that e.g. a contiguous - run of <td>s will end up in the same flex item (wrapped in a table). - - In this variant of the test, we also assign 'flex' values to the - table parts - these values should have no effect, since these children - don't themselves form flex items. The flex property _is_ honored on - the <div class="c">, though, because _its_ box _is_ a direct child of a - flexbox, so it _is_ a flex item. ---><html> - <head> - <title>CSS Test: Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items</title> - <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"> - <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"> - <link rel="match" href="reference/flexbox-table-fixup-001-ref.htm"> - <style> - div.flexbox { - border: 1px dashed blue; - width: 200px; - display: flex; - justify-content: space-around; - } - - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> - td { - padding-top: 0px; - padding-bottom: 0px; - } - - .a { - background: lightgreen; - width: 48px; - flex: 5 3 100px; - } - - .b { - background: yellow; - width: 48px; - flex: 1 2 3px; - } - - .c { - background: pink; - flex: 0 0 48px; - } - </style> - </head> - <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> - <div class="flexbox"><td class="a">cell1</td><td class="b">cell2</td></div> - - <!-- Table cell followed by tbody (they end up in the same table) --> - <div class="flexbox"><td class="a">cell1</td><tbody class="b">t</tbody></div> - - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <!-- Note: We use "space-between" (instead of "space-around") here because - it makes the math cleaner. (100px split 2 ways instead of 3 ways.) --> - <div class="flexbox" style="justify-content: space-between"><td></td><div class="c">div</div><td class="b">cell1</td></div> - </body> -</html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-003.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-003.htm index 22479c3a8b2..dcc6f0234e7 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-003.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-003.htm @@ -6,10 +6,9 @@ flex container, specifically when they've got display:table-row or table-cell. - Note that we *don't* treat the table row or cell frames themselves as flex - items, because they get wrapped in an anonymous table box, and *that* is - the flex item. So, "align-self" and "order" have no effect on the - row/cell. --><html><head> + The table-row / table-cell 'display' values should be blockified, and the + pseudo-elements should be treated as flex items. (They should not get + wrapped in an anonymous table box.) --><html><head> <title>CSS Test: Testing that generated content nodes with table-part display types are wrapped with an anonymous table, which forms a flex item</title> <link href="mailto:dholbert@mozilla.com" rel="author" title="Daniel Holbert"> <link href="http://www.w3.org/TR/css-flexbox-1/#flex-items" rel="help"> @@ -29,15 +28,19 @@ display: table-row; content: 'b'; background: yellow; - align-self: center; /* should have no effect */ - order: 1; /* should have no effect */ + /* If these "align-self" & "order" properties impact the rendering (as + they should), that verifies we're being treated as a flex item. */ + align-self: center; + order: 1; } div.withAfter::after { display: table-cell; content: 'a'; background: lightblue; - align-self: center; /* should have no effect */ - order: -1; /* should have no effect */ + /* If these "align-self" & "order" properties impact the rendering (as + they should), that verifies we're being treated as a flex item. */ + align-self: center; + order: -1; } </style> </head> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm index adbc1426a62..4c62e2adeb0 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm @@ -25,7 +25,7 @@ <div class="item">４５６</div> <div class="item">ｄｅｆ</div> <div class="item">７８９</div> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm index e9ba478711b..e6f34209cd0 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm @@ -2,22 +2,17 @@ <!-- Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ ---><!-- Reference case for table-fixup on table parts inside of a - flex container. --><html> +--><!-- Reference case for ensuring table-fixup does not happen to adjacent + table parts directly inside of a flex container. --><html> <head> <title>CSS Reftest Reference</title> <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"> <style> div.flexbox { border: 1px dashed blue; - } - - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> - td { - padding-top: 0px; - padding-bottom: 0px; + width: 200px; + display: flex; + justify-content: space-around; } .a { @@ -37,14 +32,11 @@ </style> </head> <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> - <div class="flexbox" style="padding-left: 50px; width: 150px"><td class="a">cell1</td><td class="b">cell2</td></div> + <!-- In each example here, we simply use blocks instead of table parts --> + <div class="flexbox"><div class="a">cell1</div><div class="b">cell2</div></div> - <!-- Table cell followed by tbody (they end up in the same table) --> - <div class="flexbox" style="padding-left: 75px; width: 125px"><td class="a">cell1</td><tbody class="b">t</tbody></div> + <div class="flexbox"><div class="a">cell1</div><div class="b">t</div></div> - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <div class="flexbox" style="padding-left: 52px; width: 148px"><div style="display: inline-block;" class="c">div</div><div style="display: inline-table; margin-left: 50px"><td class="b">cell1</td></div></div> + <div class="flexbox"><div></div><div class="b">cell1</div></div> </body> </html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm index 3e7bbaa5f99..2eb3494e69f 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm @@ -23,10 +23,14 @@ .fakeBefore { content: 'b'; background: yellow; + align-self: center; + order: 1; } .fakeAfter { content: 'a'; background: lightblue; + align-self: center; + order: -1; } </style> </head> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest-toc.htm index 4befb51b36f..030807532f9 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest-toc.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest-toc.htm @@ -512,6 +512,54 @@ <td rowspan="1"></td> </tr> </tbody> + <tbody id="flex-aspect-ratio-img-column-001" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-001.htm">flex-aspect-ratio-img-column-001</a></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-column-002" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-002.htm">flex-aspect-ratio-img-column-002</a></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-column-003" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-003.htm">flex-aspect-ratio-img-column-003</a></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-001" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-001.htm">flex-aspect-ratio-img-row-001</a></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-002" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-002.htm">flex-aspect-ratio-img-row-002</a></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-003" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-003.htm">flex-aspect-ratio-img-row-003</a></td> + <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> <tbody id="flex-basis-001" class=""> <tr> <td rowspan="1" title="flex-basis - positive number"> @@ -2120,18 +2168,10 @@ <td rowspan="1"></td> </tr> </tbody> - <tbody id="flexbox-table-fixup-001a" class=""> - <tr> - <td rowspan="1" title="Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item"> - <a href="flexbox-table-fixup-001a.htm">flexbox-table-fixup-001a</a></td> - <td><a href="reference/flexbox-table-fixup-001-ref.htm">=</a> </td> - <td rowspan="1"></td> - </tr> - </tbody> - <tbody id="flexbox-table-fixup-001b" class=""> + <tbody id="flexbox-table-fixup-001" class=""> <tr> - <td rowspan="1" title="Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items"> - <a href="flexbox-table-fixup-001b.htm">flexbox-table-fixup-001b</a></td> + <td rowspan="1" title="Testing that table cells in a flex container get blockified and each form their own flex item"> + <a href="flexbox-table-fixup-001.htm">flexbox-table-fixup-001</a></td> <td><a href="reference/flexbox-table-fixup-001-ref.htm">=</a> </td> <td rowspan="1"></td> </tr> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest.list b/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest.list index d864c2a8e9a..d83308d4362 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest.list +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reftest.list @@ -60,6 +60,12 @@ flex-002.htm == reference/justify-content-001-ref.htm flex-003.htm == reference/justify-content-001-ref.htm flex-004.htm == reference/justify-content-001-ref.htm flex-align-items-center.htm == reference/flex-align-items-center-ref.htm +flex-aspect-ratio-img-column-001.htm == reference/ref-filled-green-100px-square.htm +flex-aspect-ratio-img-column-002.htm == reference/ref-filled-green-100px-square.htm +flex-aspect-ratio-img-column-003.htm == reference/ref-filled-green-100px-square.htm +flex-aspect-ratio-img-row-001.htm == reference/ref-filled-green-100px-square.htm +flex-aspect-ratio-img-row-002.htm == reference/ref-filled-green-100px-square.htm +flex-aspect-ratio-img-row-003.htm == reference/ref-filled-green-100px-square.htm flex-basis-001.htm == reference/ref-filled-green-100px-square.htm flex-basis-002.htm == reference/ref-filled-green-100px-square.htm flex-basis-003.htm == reference/ref-filled-green-100px-square.htm @@ -261,8 +267,7 @@ flexbox-sizing-horiz-001.htm == reference/flexbox-sizing-horiz-001-ref.htm flexbox-sizing-horiz-002.htm == reference/flexbox-sizing-horiz-002-ref.htm flexbox-sizing-vert-001.htm == reference/flexbox-sizing-vert-001-ref.htm flexbox-sizing-vert-002.htm == reference/flexbox-sizing-vert-002-ref.htm -flexbox-table-fixup-001a.htm == reference/flexbox-table-fixup-001-ref.htm -flexbox-table-fixup-001b.htm == reference/flexbox-table-fixup-001-ref.htm +flexbox-table-fixup-001.htm == reference/flexbox-table-fixup-001-ref.htm flexbox-whitespace-handling-001a.htm == reference/flexbox-whitespace-handling-001-ref.htm flexbox-whitespace-handling-001b.htm == reference/flexbox-whitespace-handling-001-ref.htm flexbox-whitespace-handling-002.htm == reference/flexbox-whitespace-handling-002-ref.htm diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm index 2920427d381..af1a70abaa4 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm @@ -37,7 +37,7 @@ <tbody id="s4"> <tr><th><a href="chapter-4.htm">Chapter 4 - Flex Items</a></th> - <td>(72 Tests)</td></tr> + <td>(71 Tests)</td></tr> </tbody> <tbody id="s5"> <tr><th><a href="chapter-5.htm">Chapter 5 - @@ -62,7 +62,7 @@ <tbody id="s9"> <tr><th><a href="chapter-9.htm">Chapter 9 - Flex Layout Algorithm</a></th> - <td>(62 Tests)</td></tr> + <td>(68 Tests)</td></tr> </tbody> <tbody id="s10"> <tr><th><a href="chapter-10.htm">Chapter 10 - diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data index 482eb77ad0d..6f7a375d8f0 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data +++ b/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data @@ -99,18 +99,18 @@ html/column-flexbox-break.htm 447d07932ea88069d2350bf6201a4f4b8261ea21 ? xhtml1/column-flexbox-break.xht 447d07932ea88069d2350bf6201a4f4b8261ea21 ? html/css-box-justify-content.htm 8eb9ef235feb6bf970b0c71c58e98e639d447352 ? xhtml1/css-box-justify-content.xht 8eb9ef235feb6bf970b0c71c58e98e639d447352 ? -html/css-flexbox-column-reverse-wrap-reverse.htm 151160ed3d2ad2d58e598e4b1027bbc483dcc957 ? -xhtml1/css-flexbox-column-reverse-wrap-reverse.xht 151160ed3d2ad2d58e598e4b1027bbc483dcc957 ? -html/css-flexbox-column-reverse-wrap.htm 8c9461d7bb8e46a2173f6651e3596f1ea0650e94 ? -xhtml1/css-flexbox-column-reverse-wrap.xht 8c9461d7bb8e46a2173f6651e3596f1ea0650e94 ? -html/css-flexbox-column-reverse.htm a4226108be2f0af901413339910960676e0aeab3 ? -xhtml1/css-flexbox-column-reverse.xht a4226108be2f0af901413339910960676e0aeab3 ? -html/css-flexbox-column-wrap-reverse.htm 7a03ee23187886a90b8d25cf2f83ea452454b769 ? -xhtml1/css-flexbox-column-wrap-reverse.xht 7a03ee23187886a90b8d25cf2f83ea452454b769 ? -html/css-flexbox-column-wrap.htm 81bfe00b93f428cb9c18db56c7403d4b3fa8423e ? -xhtml1/css-flexbox-column-wrap.xht 81bfe00b93f428cb9c18db56c7403d4b3fa8423e ? -html/css-flexbox-column.htm 2e5bf4ca2fcfceb11ea7a14828ed53b096385155 ? -xhtml1/css-flexbox-column.xht 2e5bf4ca2fcfceb11ea7a14828ed53b096385155 ? +html/css-flexbox-column-reverse-wrap-reverse.htm 4124389b15cb84f439c4c0578c171484081ff973 ? +xhtml1/css-flexbox-column-reverse-wrap-reverse.xht 4124389b15cb84f439c4c0578c171484081ff973 ? +html/css-flexbox-column-reverse-wrap.htm 950f5d32f14a69707a50c119de4dbc95def22310 ? +xhtml1/css-flexbox-column-reverse-wrap.xht 950f5d32f14a69707a50c119de4dbc95def22310 ? +html/css-flexbox-column-reverse.htm 67d2835860268b472d6fff962a6408f2924a0fbf ? +xhtml1/css-flexbox-column-reverse.xht 67d2835860268b472d6fff962a6408f2924a0fbf ? +html/css-flexbox-column-wrap-reverse.htm d7831de1ebfb54010673179c815e0fd368b24f16 ? +xhtml1/css-flexbox-column-wrap-reverse.xht d7831de1ebfb54010673179c815e0fd368b24f16 ? +html/css-flexbox-column-wrap.htm dd812f6be787f630eaaa722f216fe1d8a98f5c20 ? +xhtml1/css-flexbox-column-wrap.xht dd812f6be787f630eaaa722f216fe1d8a98f5c20 ? +html/css-flexbox-column.htm e358c1fc3e1f03e963508ca979d5c3ea56532d65 ? +xhtml1/css-flexbox-column.xht e358c1fc3e1f03e963508ca979d5c3ea56532d65 ? html/css-flexbox-height-animation-stretch.htm c0ec675efc75f1316a44fd2ab919ba9001af8b79 ? xhtml1/css-flexbox-height-animation-stretch.xht c0ec675efc75f1316a44fd2ab919ba9001af8b79 ? html/css-flexbox-img-expand-evenly.htm a3d322e0c668c00cb991d7016ab1e7b025d493b2 ? @@ -145,6 +145,18 @@ html/flex-004.htm eacca20d92c3fd3ae90aa6531733d8112ea48f07 ? xhtml1/flex-004.xht eacca20d92c3fd3ae90aa6531733d8112ea48f07 ? html/flex-align-items-center.htm b0c25464d925ac14a19de215685135c15a2b4540 ? xhtml1/flex-align-items-center.xht b0c25464d925ac14a19de215685135c15a2b4540 ? +html/flex-aspect-ratio-img-column-001.htm 00e43725bff6f6f1c142143360dd37151d2f7bfa ? +xhtml1/flex-aspect-ratio-img-column-001.xht 00e43725bff6f6f1c142143360dd37151d2f7bfa ? +html/flex-aspect-ratio-img-column-002.htm 8299bf12926c3a9c4bd4b65185c370eb1541b2bf ? +xhtml1/flex-aspect-ratio-img-column-002.xht 8299bf12926c3a9c4bd4b65185c370eb1541b2bf ? +html/flex-aspect-ratio-img-column-003.htm 9b82b9b627e49ef062c7c6f695968eda71e38f27 ? +xhtml1/flex-aspect-ratio-img-column-003.xht 9b82b9b627e49ef062c7c6f695968eda71e38f27 ? +html/flex-aspect-ratio-img-row-001.htm b49f921a9733a1442524b04229043dd5a97aa101 ? +xhtml1/flex-aspect-ratio-img-row-001.xht b49f921a9733a1442524b04229043dd5a97aa101 ? +html/flex-aspect-ratio-img-row-002.htm b39800fb8c361a193eaaa4e54ac6d70cb508197d ? +xhtml1/flex-aspect-ratio-img-row-002.xht b39800fb8c361a193eaaa4e54ac6d70cb508197d ? +html/flex-aspect-ratio-img-row-003.htm d7189842a434a66f6380badbfd14a96093abffe4 ? +xhtml1/flex-aspect-ratio-img-row-003.xht d7189842a434a66f6380badbfd14a96093abffe4 ? html/flex-basis-001.htm cf4c8932cb4704bae235021bc2c0bde3e94bf71d ? xhtml1/flex-basis-001.xht cf4c8932cb4704bae235021bc2c0bde3e94bf71d ? html/flex-basis-002.htm bd0b95ddbaf7caf8595c5f24cdb25e24f8312f0e ? @@ -575,10 +587,8 @@ html/flexbox-sizing-vert-001.htm 4bece9556972f83b198bf5bc0e9335a2f2e5f0cd ? xhtml1/flexbox-sizing-vert-001.xht 4bece9556972f83b198bf5bc0e9335a2f2e5f0cd ? html/flexbox-sizing-vert-002.htm 752f2a91acbff746fd6ba7414e962a2c4e0e09e6 ? xhtml1/flexbox-sizing-vert-002.xht 752f2a91acbff746fd6ba7414e962a2c4e0e09e6 ? -html/flexbox-table-fixup-001a.htm 73c984c73adfae58f2b1a2ad77d7fdd9ef12fd47 ? -xhtml1/flexbox-table-fixup-001a.xht 73c984c73adfae58f2b1a2ad77d7fdd9ef12fd47 ? -html/flexbox-table-fixup-001b.htm 39c5b9776686a49723f158b01285b1c5ecda0d99 ? -xhtml1/flexbox-table-fixup-001b.xht 39c5b9776686a49723f158b01285b1c5ecda0d99 ? +html/flexbox-table-fixup-001.htm e077c9a8352635c9dce0fe7f2ff57ddc326c1035 ? +xhtml1/flexbox-table-fixup-001.xht e077c9a8352635c9dce0fe7f2ff57ddc326c1035 ? html/flexbox-whitespace-handling-001a.htm adf4c8485f397ef7c079db3aeb1df21b633b35aa ? xhtml1/flexbox-whitespace-handling-001a.xht adf4c8485f397ef7c079db3aeb1df21b633b35aa ? html/flexbox-whitespace-handling-001b.htm 97512777163dc1da26e9a2df8abd4694ec32572c ? @@ -589,8 +599,8 @@ html/flexbox-with-pseudo-elements-001.htm 840f23805278348fabc43767fbda8357c1e58b xhtml1/flexbox-with-pseudo-elements-001.xht 840f23805278348fabc43767fbda8357c1e58b8a ? html/flexbox-with-pseudo-elements-002.htm 1131841b5d5f11eac2b9e81fc6f4358d418a6f2f ? xhtml1/flexbox-with-pseudo-elements-002.xht 1131841b5d5f11eac2b9e81fc6f4358d418a6f2f ? -html/flexbox-with-pseudo-elements-003.htm 58e927b1ff3432b60ab48838cd47f1ec1b3fd0d2 ? -xhtml1/flexbox-with-pseudo-elements-003.xht 58e927b1ff3432b60ab48838cd47f1ec1b3fd0d2 ? +html/flexbox-with-pseudo-elements-003.htm f088c97d964631b8888e0adb8c6d7c2714c50db4 ? +xhtml1/flexbox-with-pseudo-elements-003.xht f088c97d964631b8888e0adb8c6d7c2714c50db4 ? html/flexbox-writing-mode-001.htm a8724a8de3bd951d06e289fb86dbadc70a885d22 ? xhtml1/flexbox-writing-mode-001.xht a8724a8de3bd951d06e289fb86dbadc70a885d22 ? html/flexbox-writing-mode-002.htm 0952e87b8e95154bbb469d828c79b8c7e02df63b ? diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/index.htm b/tests/wpt/css-tests/css-flexbox-1_dev/index.htm index a54bcb3fe27..00fceb81863 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/index.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/index.htm @@ -138,6 +138,7 @@ <li>Eiji Kitamura</li> <li>Gavin Elster</li> <li>Google</li> + <li>Google Inc.</li> <li>Hanrui Gao</li> <li>haosdent</li> <li>houzhenyu</li> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/index.xht b/tests/wpt/css-tests/css-flexbox-1_dev/index.xht index 4bb88dc3c73..4a85888d398 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/index.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/index.xht @@ -138,6 +138,7 @@ <li>Eiji Kitamura</li> <li>Gavin Elster</li> <li>Google</li> + <li>Google Inc.</li> <li>Hanrui Gao</li> <li>haosdent</li> <li>houzhenyu</li> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data b/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data index 90afec65255..22cc7710c83 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data +++ b/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data @@ -47,12 +47,12 @@ autoheight-regions-in-fixed-sized-flexbox-007 reference/autoheight-regions-in-fi autoheight-regions-in-fixed-sized-flexbox-008 reference/autoheight-regions-in-fixed-sized-flexbox-008-ref CSS Regions: auto-height regions with max height in fixed sized flexbox ahem http://www.w3.org/TR/css3-regions/#rfcb-flow-fragment-height-resolution,http://www.w3.org/TR/css3-regions/#the-flow-into-property,http://www.w3.org/TR/css3-regions/#flow-from,http://www.w3.org/TR/css-flexbox-1/#layout-algorithm ea64b7e570b77e26c14667899a6f07be7629a859 `Catalin Badea`<mailto:badea@adobe.com> Test that the max-height property is applied to regions placed inside a fixed sized flexbox with a column flow. The flex container should not flex the region flex items beyond their max height value. column-flexbox-break reference/column-flexbox-break-ref CSS Regions: fragmenting a flex container with column flow ahem http://www.w3.org/TR/css3-regions/#the-flow-into-property,http://www.w3.org/TR/css3-regions/#flow-from,http://www.w3.org/TR/css-flexbox-1/#flex-containers,http://www.w3.org/TR/css-flexbox-1/#flex-direction-property 447d07932ea88069d2350bf6201a4f4b8261ea21 `Catalin Badea`<mailto:badea@adobe.com> Test checks that a flex container with column flow is fragmented between regions. css-box-justify-content reference/css-box-justify-content-ref flexbox |css-box-justify-content http://www.w3.org/TR/css-flexbox-1/#propdef-justify-content,http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 8eb9ef235feb6bf970b0c71c58e98e639d447352 `xiaoxia`<ava656094@gmail.com> -css-flexbox-column reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 2e5bf4ca2fcfceb11ea7a14828ed53b096385155 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column, the flex container is vertical. -css-flexbox-column-reverse reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow a4226108be2f0af901413339910960676e0aeab3 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column, the flex container is vertical. -css-flexbox-column-reverse-wrap reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 8c9461d7bb8e46a2173f6651e3596f1ea0650e94 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap, the flex container is vertical. -css-flexbox-column-reverse-wrap-reverse reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 151160ed3d2ad2d58e598e4b1027bbc483dcc957 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap-reverse, the flex container is vertical. -css-flexbox-column-wrap reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 81bfe00b93f428cb9c18db56c7403d4b3fa8423e `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap, the flex container is vertical. -css-flexbox-column-wrap-reverse reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 7a03ee23187886a90b8d25cf2f83ea452454b769 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap-reverse, the flex container is vertical. +css-flexbox-column reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow e358c1fc3e1f03e963508ca979d5c3ea56532d65 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column, the flex container is vertical. +css-flexbox-column-reverse reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 67d2835860268b472d6fff962a6408f2924a0fbf `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column, the flex container is vertical. +css-flexbox-column-reverse-wrap reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 950f5d32f14a69707a50c119de4dbc95def22310 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap, the flex container is vertical. +css-flexbox-column-reverse-wrap-reverse reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow 4124389b15cb84f439c4c0578c171484081ff973 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap-reverse, the flex container is vertical. +css-flexbox-column-wrap reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow dd812f6be787f630eaaa722f216fe1d8a98f5c20 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap, the flex container is vertical. +css-flexbox-column-wrap-reverse reference/css-flexbox-column-ref flex direction: row http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow d7831de1ebfb54010673179c815e0fd368b24f16 `Naoki Okada`<mailto:somathor@gmail.com> Test checks that when writing mode is vertical and flex-flow: column wrap-reverse, the flex container is vertical. css-flexbox-height-animation-stretch reference/css-flexbox-height-animation-stretch-ref Items stretch correctly while content is animating http://www.w3.org/TR/css-flexbox-1/#propdef-align-items c0ec675efc75f1316a44fd2ab919ba9001af8b79 `Micky Brunetti`<mailto:micky2be@gmail.com> Items should stretch vertically in all time css-flexbox-img-expand-evenly reference/css-flexbox-img-expand-evenly-ref Image Expansion http://www.w3.org/TR/css-flexbox-1/#propdef-flex-grow a3d322e0c668c00cb991d7016ab1e7b025d493b2 `Eiji Kitamura`<mailto:agektmr@gmail.com> 3 rectangular images fill out border. css-flexbox-row reference/css-flexbox-row-ref flex direction: row, writing mode vertical http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow,http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode 2095a3cec191a88ee70b6fa4f9186cc94aba326b `Tsutomu ogaoga Ogasawara`<mailto:info@ogaoga.org> Test checks that when writing mode is vertical and flex-flow: row, the flex container is vertical. @@ -70,6 +70,12 @@ flex-002 reference/justify-content-001-ref The 'flex' shorthand adjusting the 'f flex-003 reference/justify-content-001-ref Comparing two different elements using different values for the 'flex-grow' sub-property on the 'flex' shorthand http://www.w3.org/TR/css-flexbox-1/#flex-property aa083c3c37e6ccf91569adfb76e7fbfd26af5cf0 `Microsoft`<http://www.microsoft.com/> This test checks that the flex items with a different flex grow factor have different flexibilities. flex-004 reference/justify-content-001-ref Comparing two different elements using different values for the 'flex-shrink' sub-property on the 'flex' shorthand http://www.w3.org/TR/css-flexbox-1/#flex-property eacca20d92c3fd3ae90aa6531733d8112ea48f07 `Microsoft`<http://www.microsoft.com/> This test checks that the flex items with a different flex shrink factor have different flexibilities. flex-align-items-center reference/flex-align-items-center-ref CSS Flex-basis Test http://www.w3.org/TR/css-flexbox-1/#alignment b0c25464d925ac14a19de215685135c15a2b4540 `Chunsheng Zhang`<mailto:zhangcs_423@163.com> flex items center +flex-aspect-ratio-img-column-001 reference/ref-filled-green-100px-square Aspect ratio handling of images https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size 00e43725bff6f6f1c142143360dd37151d2f7bfa `Google Inc.`<http://www.google.com/> +flex-aspect-ratio-img-column-002 reference/ref-filled-green-100px-square Aspect ratio handling of images https://drafts.csswg.org/css-flexbox-1/#algo-cross-item 8299bf12926c3a9c4bd4b65185c370eb1541b2bf `Google Inc.`<http://www.google.com/> Test that we compute the correct aspect-ratio based cross size when a height is specified +flex-aspect-ratio-img-column-003 reference/ref-filled-green-100px-square Aspect ratio handling of images https://drafts.csswg.org/css-flexbox-1/#algo-cross-item 9b82b9b627e49ef062c7c6f695968eda71e38f27 `Google Inc.`<http://www.google.com/> Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified +flex-aspect-ratio-img-row-001 reference/ref-filled-green-100px-square Aspect ratio handling of images https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size b49f921a9733a1442524b04229043dd5a97aa101 `Google Inc.`<http://www.google.com/> +flex-aspect-ratio-img-row-002 reference/ref-filled-green-100px-square Aspect ratio handling of images https://drafts.csswg.org/css-flexbox-1/#algo-cross-item b39800fb8c361a193eaaa4e54ac6d70cb508197d `Google Inc.`<http://www.google.com/> Test that we compute the correct aspect-ratio based cross size when a width is specified +flex-aspect-ratio-img-row-003 reference/ref-filled-green-100px-square Aspect ratio handling of images https://drafts.csswg.org/css-flexbox-1/#algo-cross-item d7189842a434a66f6380badbfd14a96093abffe4 `Google Inc.`<http://www.google.com/> Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified flex-basis-001 reference/ref-filled-green-100px-square flex-basis - positive number http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis cf4c8932cb4704bae235021bc2c0bde3e94bf71d `http://www.intel.com`<Intel>,`mailto:shiyoux.tan@intel.com`<Intel> The 'flex-basis' property set positive number, the actual value of test element size is same as the positive number flex-basis-002 reference/ref-filled-green-100px-square flex-basis - positive number http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis bd0b95ddbaf7caf8595c5f24cdb25e24f8312f0e `http://www.intel.com`<Intel>,`mailto:shiyoux.tan@intel.com`<Intel> The 'flex-basis' property specified correct value, the actual value of test element size is same as to the value of 'flex-basis' property, and the 'width' property is invalid. flex-basis-003 reference/ref-filled-green-100px-square flex-basis - negative number(width not specified) http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis 75bc5a47afacb6416a93c6eb0fd876c4ad288f76 `http://www.intel.com`<Intel>,`mailto:shiyoux.tan@intel.com`<Intel> The 'flex-basis' property set negative number, the tested element is not shown when width not set either. @@ -285,14 +291,13 @@ flexbox-sizing-horiz-001 reference/flexbox-sizing-horiz-001-ref Testing sizing o flexbox-sizing-horiz-002 reference/flexbox-sizing-horiz-002-ref Testing sizing of an auto-sized horizontal flex container with min-height and max-height constraints http://www.w3.org/TR/css-flexbox-1/#layout-algorithm 4963f41505c0e53be620ff6158dfba5c5c6fe26b `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-sizing-vert-001 reference/flexbox-sizing-vert-001-ref Testing sizing of an auto-sized vertical flex container with min-height and max-height constraints http://www.w3.org/TR/css-flexbox-1/#layout-algorithm 4bece9556972f83b198bf5bc0e9335a2f2e5f0cd `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-sizing-vert-002 reference/flexbox-sizing-vert-002-ref Testing sizing of an auto-sized vertical flex container with min-width and max-width constraints http://www.w3.org/TR/css-flexbox-1/#layout-algorithm 752f2a91acbff746fd6ba7414e962a2c4e0e09e6 `Daniel Holbert`<mailto:dholbert@mozilla.com> -flexbox-table-fixup-001a reference/flexbox-table-fixup-001-ref Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item http://www.w3.org/TR/css-flexbox-1/#flex-items 73c984c73adfae58f2b1a2ad77d7fdd9ef12fd47 `Daniel Holbert`<mailto:dholbert@mozilla.com> -flexbox-table-fixup-001b reference/flexbox-table-fixup-001-ref Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items http://www.w3.org/TR/css-flexbox-1/#flex-items 39c5b9776686a49723f158b01285b1c5ecda0d99 `Daniel Holbert`<mailto:dholbert@mozilla.com> +flexbox-table-fixup-001 reference/flexbox-table-fixup-001-ref Testing that table cells in a flex container get blockified and each form their own flex item http://www.w3.org/TR/css-flexbox-1/#flex-items e077c9a8352635c9dce0fe7f2ff57ddc326c1035 `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-whitespace-handling-001a reference/flexbox-whitespace-handling-001-ref Test that anonymous flex items aren't created for pure-whitespace inline content http://www.w3.org/TR/css-flexbox-1/#flex-items adf4c8485f397ef7c079db3aeb1df21b633b35aa `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-whitespace-handling-001b reference/flexbox-whitespace-handling-001-ref Test that flex items are created correctly http://www.w3.org/TR/css-flexbox-1/#flex-items 97512777163dc1da26e9a2df8abd4694ec32572c `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-whitespace-handling-002 reference/flexbox-whitespace-handling-002-ref Test that whitespace is preserved at the edges of anonymous flex items if 'white-space: pre' is set http://www.w3.org/TR/css-flexbox-1/#flex-items 6de836d376b85b954af361b51db27193dd535603 `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-with-pseudo-elements-001 reference/flexbox-with-pseudo-elements-001-ref Testing that generated content nodes are treated as a flex items http://www.w3.org/TR/css-flexbox-1/#flex-items 840f23805278348fabc43767fbda8357c1e58b8a `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-with-pseudo-elements-002 reference/flexbox-with-pseudo-elements-002-ref Testing that generated content nodes are treated as a flex items, and honor 'order' http://www.w3.org/TR/css-flexbox-1/#flex-items 1131841b5d5f11eac2b9e81fc6f4358d418a6f2f `Daniel Holbert`<mailto:dholbert@mozilla.com> -flexbox-with-pseudo-elements-003 reference/flexbox-with-pseudo-elements-003-ref Testing that generated content nodes with table-part display types are wrapped with an anonymous table, which forms a flex item http://www.w3.org/TR/css-flexbox-1/#flex-items 58e927b1ff3432b60ab48838cd47f1ec1b3fd0d2 `Daniel Holbert`<mailto:dholbert@mozilla.com> +flexbox-with-pseudo-elements-003 reference/flexbox-with-pseudo-elements-003-ref Testing that generated content nodes with table-part display types are wrapped with an anonymous table, which forms a flex item http://www.w3.org/TR/css-flexbox-1/#flex-items f088c97d964631b8888e0adb8c6d7c2714c50db4 `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-writing-mode-001 reference/flexbox-writing-mode-001-ref Try various flex-flow values, with 'direction: ltr' and 'writing-mode: horizontal-tb' http://www.w3.org/TR/css-flexbox-1/#propdef-flex-direction a8724a8de3bd951d06e289fb86dbadc70a885d22 `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-writing-mode-002 reference/flexbox-writing-mode-002-ref Try various flex-flow values, with 'direction: ltr' and 'writing-mode: vertical-rl' http://www.w3.org/TR/css-flexbox-1/#propdef-flex-direction 0952e87b8e95154bbb469d828c79b8c7e02df63b `Daniel Holbert`<mailto:dholbert@mozilla.com> flexbox-writing-mode-003 reference/flexbox-writing-mode-003-ref Try various flex-flow values, with 'direction: ltr' and 'writing-mode: vertical-lr' http://www.w3.org/TR/css-flexbox-1/#propdef-flex-direction c64a448ab00761be9fc61d430a293f990e0b26ca `Daniel Holbert`<mailto:dholbert@mozilla.com> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht index a54c7840794..563a03b7463 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht @@ -13,7 +13,7 @@ <body> <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1> - <h2>Flex Items (72 tests)</h2> + <h2>Flex Items (71 tests)</h2> <table width="100%"> <col id="test-column"></col> <col id="refs-column"></col> @@ -31,7 +31,7 @@ <tr><th colspan="4" scope="rowgroup"> <a href="#s4">+</a> <a href="https://www.w3.org/TR/css-flexbox-1/#flex-items">4 Flex Items</a></th></tr> - <!-- 24 tests --> + <!-- 23 tests --> <tr id="flex-flexitem-childmargin-4" class=""> <td> <a href="flex-flexitem-childmargin.xht">flex-flexitem-childmargin</a></td> @@ -62,20 +62,12 @@ <td>Testing that we gracefully handle cases where two anonymous flex items become adjacent due to "order" reordering </td> </tr> - <tr id="flexbox-table-fixup-001a-4" class=""> + <tr id="flexbox-table-fixup-001-4" class=""> <td> - <a href="flexbox-table-fixup-001a.xht">flexbox-table-fixup-001a</a></td> + <a href="flexbox-table-fixup-001.xht">flexbox-table-fixup-001</a></td> <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> <td></td> - <td>Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item - </td> - </tr> - <tr id="flexbox-table-fixup-001b-4" class=""> - <td> - <a href="flexbox-table-fixup-001b.xht">flexbox-table-fixup-001b</a></td> - <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> - <td></td> - <td>Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items + <td>Testing that table cells in a flex container get blockified and each form their own flex item </td> </tr> <tr id="flexbox-whitespace-handling-001a-4" class=""> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht index 054abb13b4a..d441ea2784e 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht @@ -13,7 +13,7 @@ <body> <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1> - <h2>Flex Layout Algorithm (62 tests)</h2> + <h2>Flex Layout Algorithm (68 tests)</h2> <table width="100%"> <col id="test-column"></col> <col id="refs-column"></col> @@ -517,7 +517,23 @@ <!-- 0 tests --> </tbody> <tbody id="s9.2.#hypothetical-main-size"> - <!-- 0 tests --> + <!-- 2 tests --> + <tr id="flex-aspect-ratio-img-column-001-9.2.#hypothetical-main-size" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-001.xht">flex-aspect-ratio-img-column-001</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-001-9.2.#hypothetical-main-size" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-001.xht">flex-aspect-ratio-img-row-001</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + </td> + </tr> </tbody> <tbody id="s9.3"> <tr><th colspan="4" scope="rowgroup"> @@ -613,7 +629,51 @@ <!-- 0 tests --> </tbody> <tbody id="s9.4.#algo-cross-item"> - <!-- 0 tests --> + <!-- 4 tests --> + <tr id="flex-aspect-ratio-img-column-002-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-002.xht">flex-aspect-ratio-img-column-002</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a height is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-column-003-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-003.xht">flex-aspect-ratio-img-column-003</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-002-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-002.xht">flex-aspect-ratio-img-row-002</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a width is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-003-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-003.xht">flex-aspect-ratio-img-row-003</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified</li> + </ul> + </td> + </tr> </tbody> <tbody id="s9.4.#algo-cross-line"> <!-- 0 tests --> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap-reverse.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap-reverse.xht index 89f04eacbc4..6c2e8503b46 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap-reverse.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap-reverse.xht @@ -31,19 +31,19 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <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 class="item">３</div> - <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 class="item">２</div> - <div class="item">ｇ</div> + <div class="item">ｓ</div> <div class="item">７</div> <div class="item">ｄ</div> <div class="item">４</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap.xht index ae756f965fe..e84765f96e5 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse-wrap.xht @@ -31,19 +31,19 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <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 class="item">１</div> - <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 class="item">２</div> - <div class="item">ｉ</div> + <div class="item">ｕ</div> <div class="item">９</div> <div class="item">ｆ</div> <div class="item">６</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse.xht index 9d7ec41b8d9..c744de241f6 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-reverse.xht @@ -28,7 +28,7 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> <div class="item">７８９</div> <div class="item">ｄｅｆ</div> <div class="item">４５６</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap-reverse.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap-reverse.xht index 0afe2787f5e..a0ddabdbba9 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap-reverse.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap-reverse.xht @@ -36,19 +36,19 @@ <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 class="item">ｂ</div> <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 class="item">ａ</div> <div class="item">４</div> <div class="item">ｄ</div> <div class="item">７</div> - <div class="item">ｇ</div> + <div class="item">ｓ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap.xht index aeaebe31fc0..20b6da6fdd2 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column-wrap.xht @@ -36,19 +36,19 @@ <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 class="item">ｂ</div> <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 class="item">ｃ</div> <div class="item">６</div> <div class="item">ｆ</div> <div class="item">９</div> - <div class="item">ｉ</div> + <div class="item">ｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column.xht index 032fba3e598..20a7ed7ccff 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/css-flexbox-column.xht @@ -33,7 +33,7 @@ <div class="item">４５６</div> <div class="item">ｄｅｆ</div> <div class="item">７８９</div> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-001.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-001.xht new file mode 100644 index 00000000000..2f761c2fac7 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-001.xht @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + width: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-002.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-002.xht new file mode 100644 index 00000000000..6e120f4b772 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-002.xht @@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a height is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + height: 100px; + align-self: flex-start; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-003.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-003.xht new file mode 100644 index 00000000000..fc9790011f4 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-column-003.xht @@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + flex-basis: 100px; + align-self: flex-start; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-001.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-001.xht new file mode 100644 index 00000000000..7fb7e068bb6 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-001.xht @@ -0,0 +1,38 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + height: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-002.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-002.xht new file mode 100644 index 00000000000..a5e7bd4576d --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-002.xht @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a width is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + width: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-003.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-003.xht new file mode 100644 index 00000000000..77f9557600c --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flex-aspect-ratio-img-row-003.xht @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + flex-basis: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-table-fixup-001a.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-table-fixup-001.xht index 7589ffd6ad2..04933cb4f56 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-table-fixup-001a.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-table-fixup-001.xht @@ -2,13 +2,14 @@ Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ --><!-- - Testcase with table parts inside of a flex container, triggering - table-fixup. We use justify-content:space-between to stick packing + Testcase with table parts inside of a flex container, which should *not* + trigger table-fixup. We use justify-content:space-between to stick packing space between flex items, so that we can verify that e.g. a contiguous - run of <td>s will end up in the same flex item (wrapped in a table). + run of <td>s will each be blockified & form its own flex item (instead of + being aggregated into a single table & single flex item). --><html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>CSS Test: Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item</title> + <title>CSS Test: Testing that table cells in a flex container get blockified and each form their own flex item</title> <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/> <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"/> <link rel="match" href="reference/flexbox-table-fixup-001-ref.xht"/> @@ -20,12 +21,10 @@ justify-content: space-around; } - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> td { - padding-top: 0px; - padding-bottom: 0px; + /* Remove any default padding for td elements, so we can compare them + easily against blocks in the reference case. */ + padding: 0px; } .a { @@ -45,16 +44,16 @@ </style> </head> <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> + <!-- The adjacent table-parts in each example below should *not* be + grouped into the same flex item. --> + <!-- 2 adjacent table cells --> <div class="flexbox"><td class="a">cell1</td><td class="b">cell2</td></div> - <!-- Table cell followed by tbody (they end up in the same table) --> + <!-- Table cell followed by tbody --> <div class="flexbox"><td class="a">cell1</td><tbody class="b">t</tbody></div> - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <!-- Note: We use "space-between" (instead of "space-around") here because - it makes the math cleaner. (100px split 2 ways instead of 3 ways.) --> - <div class="flexbox" style="justify-content: space-between"><td/><div class="c">div</div><td class="b">cell1</td></div> + <!-- Empty table cell (ends up occupying 2px of width), followed by + nonempty table cell.--> + <div class="flexbox"><td/><td class="b">cell1</td></div> </body> </html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-table-fixup-001b.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-table-fixup-001b.xht deleted file mode 100644 index 701ddd9fed3..00000000000 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-table-fixup-001b.xht +++ /dev/null @@ -1,68 +0,0 @@ -<!-- - Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ ---><!-- - Testcase with table parts inside of a flex container, triggering - table-fixup. We use justify-content:space-between to stick packing - space between flex items, so that we can verify that e.g. a contiguous - run of <td>s will end up in the same flex item (wrapped in a table). - - In this variant of the test, we also assign 'flex' values to the - table parts - these values should have no effect, since these children - don't themselves form flex items. The flex property _is_ honored on - the <div class="c">, though, because _its_ box _is_ a direct child of a - flexbox, so it _is_ a flex item. ---><html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title>CSS Test: Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items</title> - <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/> - <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"/> - <link rel="match" href="reference/flexbox-table-fixup-001-ref.xht"/> - <style> - div.flexbox { - border: 1px dashed blue; - width: 200px; - display: flex; - justify-content: space-around; - } - - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> - td { - padding-top: 0px; - padding-bottom: 0px; - } - - .a { - background: lightgreen; - width: 48px; - flex: 5 3 100px; - } - - .b { - background: yellow; - width: 48px; - flex: 1 2 3px; - } - - .c { - background: pink; - flex: 0 0 48px; - } - </style> - </head> - <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> - <div class="flexbox"><td class="a">cell1</td><td class="b">cell2</td></div> - - <!-- Table cell followed by tbody (they end up in the same table) --> - <div class="flexbox"><td class="a">cell1</td><tbody class="b">t</tbody></div> - - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <!-- Note: We use "space-between" (instead of "space-around") here because - it makes the math cleaner. (100px split 2 ways instead of 3 ways.) --> - <div class="flexbox" style="justify-content: space-between"><td/><div class="c">div</div><td class="b">cell1</td></div> - </body> -</html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-with-pseudo-elements-003.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-with-pseudo-elements-003.xht index 3f1f97cc7c9..f4622cad58e 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-with-pseudo-elements-003.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/flexbox-with-pseudo-elements-003.xht @@ -6,10 +6,9 @@ flex container, specifically when they've got display:table-row or table-cell. - Note that we *don't* treat the table row or cell frames themselves as flex - items, because they get wrapped in an anonymous table box, and *that* is - the flex item. So, "align-self" and "order" have no effect on the - row/cell. --><html xmlns="http://www.w3.org/1999/xhtml"><head> + The table-row / table-cell 'display' values should be blockified, and the + pseudo-elements should be treated as flex items. (They should not get + wrapped in an anonymous table box.) --><html xmlns="http://www.w3.org/1999/xhtml"><head> <title>CSS Test: Testing that generated content nodes with table-part display types are wrapped with an anonymous table, which forms a flex item</title> <link href="mailto:dholbert@mozilla.com" rel="author" title="Daniel Holbert" /> <link href="http://www.w3.org/TR/css-flexbox-1/#flex-items" rel="help" /> @@ -29,15 +28,19 @@ display: table-row; content: 'b'; background: yellow; - align-self: center; /* should have no effect */ - order: 1; /* should have no effect */ + /* If these "align-self" & "order" properties impact the rendering (as + they should), that verifies we're being treated as a flex item. */ + align-self: center; + order: 1; } div.withAfter::after { display: table-cell; content: 'a'; background: lightblue; - align-self: center; /* should have no effect */ - order: -1; /* should have no effect */ + /* If these "align-self" & "order" properties impact the rendering (as + they should), that verifies we're being treated as a flex item. */ + align-self: center; + order: -1; } </style> </head> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht index 3ac0639340b..45c6e583630 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht @@ -25,7 +25,7 @@ <div class="item">４５６</div> <div class="item">ｄｅｆ</div> <div class="item">７８９</div> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht index 0cc62afefc8..df7aff59d7f 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht @@ -1,22 +1,17 @@ <!-- Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ ---><!-- Reference case for table-fixup on table parts inside of a - flex container. --><html xmlns="http://www.w3.org/1999/xhtml"> +--><!-- Reference case for ensuring table-fixup does not happen to adjacent + table parts directly inside of a flex container. --><html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>CSS Reftest Reference</title> <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/> <style> div.flexbox { border: 1px dashed blue; - } - - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> - td { - padding-top: 0px; - padding-bottom: 0px; + width: 200px; + display: flex; + justify-content: space-around; } .a { @@ -36,14 +31,11 @@ </style> </head> <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> - <div class="flexbox" style="padding-left: 50px; width: 150px"><td class="a">cell1</td><td class="b">cell2</td></div> + <!-- In each example here, we simply use blocks instead of table parts --> + <div class="flexbox"><div class="a">cell1</div><div class="b">cell2</div></div> - <!-- Table cell followed by tbody (they end up in the same table) --> - <div class="flexbox" style="padding-left: 75px; width: 125px"><td class="a">cell1</td><tbody class="b">t</tbody></div> + <div class="flexbox"><div class="a">cell1</div><div class="b">t</div></div> - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <div class="flexbox" style="padding-left: 52px; width: 148px"><div style="display: inline-block;" class="c">div</div><div style="display: inline-table; margin-left: 50px"><td class="b">cell1</td></div></div> + <div class="flexbox"><div/><div class="b">cell1</div></div> </body> </html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht index 364f554c3c8..69df8dd4ebc 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht @@ -23,10 +23,14 @@ .fakeBefore { content: 'b'; background: yellow; + align-self: center; + order: 1; } .fakeAfter { content: 'a'; background: lightblue; + align-self: center; + order: -1; } </style> </head> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest-toc.xht index bd797e69228..1719d74d30d 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest-toc.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest-toc.xht @@ -512,6 +512,54 @@ <td rowspan="1"></td> </tr> </tbody> + <tbody id="flex-aspect-ratio-img-column-001" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-001.xht">flex-aspect-ratio-img-column-001</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-column-002" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-002.xht">flex-aspect-ratio-img-column-002</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-column-003" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-003.xht">flex-aspect-ratio-img-column-003</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-001" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-001.xht">flex-aspect-ratio-img-row-001</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-002" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-002.xht">flex-aspect-ratio-img-row-002</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-003" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-003.xht">flex-aspect-ratio-img-row-003</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> <tbody id="flex-basis-001" class=""> <tr> <td rowspan="1" title="flex-basis - positive number"> @@ -2120,18 +2168,10 @@ <td rowspan="1"></td> </tr> </tbody> - <tbody id="flexbox-table-fixup-001a" class=""> - <tr> - <td rowspan="1" title="Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item"> - <a href="flexbox-table-fixup-001a.xht">flexbox-table-fixup-001a</a></td> - <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> - <td rowspan="1"></td> - </tr> - </tbody> - <tbody id="flexbox-table-fixup-001b" class=""> + <tbody id="flexbox-table-fixup-001" class=""> <tr> - <td rowspan="1" title="Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items"> - <a href="flexbox-table-fixup-001b.xht">flexbox-table-fixup-001b</a></td> + <td rowspan="1" title="Testing that table cells in a flex container get blockified and each form their own flex item"> + <a href="flexbox-table-fixup-001.xht">flexbox-table-fixup-001</a></td> <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> <td rowspan="1"></td> </tr> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest.list index f922a5de004..51deb4f4cf7 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest.list +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reftest.list @@ -60,6 +60,12 @@ flex-002.xht == reference/justify-content-001-ref.xht flex-003.xht == reference/justify-content-001-ref.xht flex-004.xht == reference/justify-content-001-ref.xht flex-align-items-center.xht == reference/flex-align-items-center-ref.xht +flex-aspect-ratio-img-column-001.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-column-002.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-column-003.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-row-001.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-row-002.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-row-003.xht == reference/ref-filled-green-100px-square.xht flex-basis-001.xht == reference/ref-filled-green-100px-square.xht flex-basis-002.xht == reference/ref-filled-green-100px-square.xht flex-basis-003.xht == reference/ref-filled-green-100px-square.xht @@ -261,8 +267,7 @@ flexbox-sizing-horiz-001.xht == reference/flexbox-sizing-horiz-001-ref.xht flexbox-sizing-horiz-002.xht == reference/flexbox-sizing-horiz-002-ref.xht flexbox-sizing-vert-001.xht == reference/flexbox-sizing-vert-001-ref.xht flexbox-sizing-vert-002.xht == reference/flexbox-sizing-vert-002-ref.xht -flexbox-table-fixup-001a.xht == reference/flexbox-table-fixup-001-ref.xht -flexbox-table-fixup-001b.xht == reference/flexbox-table-fixup-001-ref.xht +flexbox-table-fixup-001.xht == reference/flexbox-table-fixup-001-ref.xht flexbox-whitespace-handling-001a.xht == reference/flexbox-whitespace-handling-001-ref.xht flexbox-whitespace-handling-001b.xht == reference/flexbox-whitespace-handling-001-ref.xht flexbox-whitespace-handling-002.xht == reference/flexbox-whitespace-handling-002-ref.xht diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht index 134ef8abb41..0569a941892 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht @@ -37,7 +37,7 @@ <tbody id="s4"> <tr><th><a href="chapter-4.xht">Chapter 4 - Flex Items</a></th> - <td>(72 Tests)</td></tr> + <td>(71 Tests)</td></tr> </tbody> <tbody id="s5"> <tr><th><a href="chapter-5.xht">Chapter 5 - @@ -62,7 +62,7 @@ <tbody id="s9"> <tr><th><a href="chapter-9.xht">Chapter 9 - Flex Layout Algorithm</a></th> - <td>(62 Tests)</td></tr> + <td>(68 Tests)</td></tr> </tbody> <tbody id="s10"> <tr><th><a href="chapter-10.xht">Chapter 10 - diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht index a54c7840794..563a03b7463 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht @@ -13,7 +13,7 @@ <body> <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1> - <h2>Flex Items (72 tests)</h2> + <h2>Flex Items (71 tests)</h2> <table width="100%"> <col id="test-column"></col> <col id="refs-column"></col> @@ -31,7 +31,7 @@ <tr><th colspan="4" scope="rowgroup"> <a href="#s4">+</a> <a href="https://www.w3.org/TR/css-flexbox-1/#flex-items">4 Flex Items</a></th></tr> - <!-- 24 tests --> + <!-- 23 tests --> <tr id="flex-flexitem-childmargin-4" class=""> <td> <a href="flex-flexitem-childmargin.xht">flex-flexitem-childmargin</a></td> @@ -62,20 +62,12 @@ <td>Testing that we gracefully handle cases where two anonymous flex items become adjacent due to "order" reordering </td> </tr> - <tr id="flexbox-table-fixup-001a-4" class=""> + <tr id="flexbox-table-fixup-001-4" class=""> <td> - <a href="flexbox-table-fixup-001a.xht">flexbox-table-fixup-001a</a></td> + <a href="flexbox-table-fixup-001.xht">flexbox-table-fixup-001</a></td> <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> <td></td> - <td>Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item - </td> - </tr> - <tr id="flexbox-table-fixup-001b-4" class=""> - <td> - <a href="flexbox-table-fixup-001b.xht">flexbox-table-fixup-001b</a></td> - <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> - <td></td> - <td>Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items + <td>Testing that table cells in a flex container get blockified and each form their own flex item </td> </tr> <tr id="flexbox-whitespace-handling-001a-4" class=""> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht index 054abb13b4a..d441ea2784e 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht @@ -13,7 +13,7 @@ <body> <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1> - <h2>Flex Layout Algorithm (62 tests)</h2> + <h2>Flex Layout Algorithm (68 tests)</h2> <table width="100%"> <col id="test-column"></col> <col id="refs-column"></col> @@ -517,7 +517,23 @@ <!-- 0 tests --> </tbody> <tbody id="s9.2.#hypothetical-main-size"> - <!-- 0 tests --> + <!-- 2 tests --> + <tr id="flex-aspect-ratio-img-column-001-9.2.#hypothetical-main-size" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-001.xht">flex-aspect-ratio-img-column-001</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-001-9.2.#hypothetical-main-size" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-001.xht">flex-aspect-ratio-img-row-001</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + </td> + </tr> </tbody> <tbody id="s9.3"> <tr><th colspan="4" scope="rowgroup"> @@ -613,7 +629,51 @@ <!-- 0 tests --> </tbody> <tbody id="s9.4.#algo-cross-item"> - <!-- 0 tests --> + <!-- 4 tests --> + <tr id="flex-aspect-ratio-img-column-002-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-002.xht">flex-aspect-ratio-img-column-002</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a height is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-column-003-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-column-003.xht">flex-aspect-ratio-img-column-003</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-002-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-002.xht">flex-aspect-ratio-img-row-002</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a width is specified</li> + </ul> + </td> + </tr> + <tr id="flex-aspect-ratio-img-row-003-9.4.#algo-cross-item" class="primary"> + <td><strong> + <a href="flex-aspect-ratio-img-row-003.xht">flex-aspect-ratio-img-row-003</a></strong></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td></td> + <td>Aspect ratio handling of images + <ul class="assert"> + <li>Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified</li> + </ul> + </td> + </tr> </tbody> <tbody id="s9.4.#algo-cross-line"> <!-- 0 tests --> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap-reverse.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap-reverse.xht index 89f04eacbc4..6c2e8503b46 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap-reverse.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap-reverse.xht @@ -31,19 +31,19 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <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 class="item">３</div> - <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 class="item">２</div> - <div class="item">ｇ</div> + <div class="item">ｓ</div> <div class="item">７</div> <div class="item">ｄ</div> <div class="item">４</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap.xht index ae756f965fe..e84765f96e5 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse-wrap.xht @@ -31,19 +31,19 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <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 class="item">１</div> - <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 class="item">２</div> - <div class="item">ｉ</div> + <div class="item">ｕ</div> <div class="item">９</div> <div class="item">ｆ</div> <div class="item">６</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse.xht index 9d7ec41b8d9..c744de241f6 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-reverse.xht @@ -28,7 +28,7 @@ <body> <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p> <div class="container"> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> <div class="item">７８９</div> <div class="item">ｄｅｆ</div> <div class="item">４５６</div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap-reverse.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap-reverse.xht index 0afe2787f5e..a0ddabdbba9 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap-reverse.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap-reverse.xht @@ -36,19 +36,19 @@ <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 class="item">ｂ</div> <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 class="item">ａ</div> <div class="item">４</div> <div class="item">ｄ</div> <div class="item">７</div> - <div class="item">ｇ</div> + <div class="item">ｓ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap.xht index aeaebe31fc0..20b6da6fdd2 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column-wrap.xht @@ -36,19 +36,19 @@ <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 class="item">ｂ</div> <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 class="item">ｃ</div> <div class="item">６</div> <div class="item">ｆ</div> <div class="item">９</div> - <div class="item">ｉ</div> + <div class="item">ｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column.xht index 032fba3e598..20a7ed7ccff 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/css-flexbox-column.xht @@ -33,7 +33,7 @@ <div class="item">４５６</div> <div class="item">ｄｅｆ</div> <div class="item">７８９</div> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-001.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-001.xht new file mode 100644 index 00000000000..2f761c2fac7 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-001.xht @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + width: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-002.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-002.xht new file mode 100644 index 00000000000..6e120f4b772 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-002.xht @@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a height is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + height: 100px; + align-self: flex-start; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-003.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-003.xht new file mode 100644 index 00000000000..fc9790011f4 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-column-003.xht @@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + flex-direction: column; + height: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + flex-basis: 100px; + align-self: flex-start; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-001.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-001.xht new file mode 100644 index 00000000000..7fb7e068bb6 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-001.xht @@ -0,0 +1,38 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#hypothetical-main-size" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + height: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-002.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-002.xht new file mode 100644 index 00000000000..a5e7bd4576d --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-002.xht @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a width is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + width: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-003.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-003.xht new file mode 100644 index 00000000000..77f9557600c --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flex-aspect-ratio-img-row-003.xht @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> + <title>CSS Flexible Box Test: Aspect ratio handling of images</title> + <link href="http://www.google.com/" rel="author" title="Google Inc." /> + <link href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" rel="help" /> + <link href="reference/ref-filled-green-100px-square.xht" rel="match" /> + <meta content="Test that we compute the correct aspect-ratio based cross size when a flex-basis is specified" name="assert" /> + <style type="text/css"> + #reference-overlapped-red { + position: absolute; + background-color: red; + width: 100px; + height: 100px; + z-index: -1; + } + + #constrained-flex { + display: flex; + width: 10px; + } + + img { + min-width: 0; + min-height: 0; + flex: none; + flex-basis: 100px; + } + </style> + </head> + <body> + <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> + + <div id="reference-overlapped-red"></div> + <div id="constrained-flex"> + <img src="support/200x200-green.png" id="test-flex-item-overlapping-green" /> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-table-fixup-001a.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-table-fixup-001.xht index 90fa082c34e..f1e4b240f38 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-table-fixup-001a.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-table-fixup-001.xht @@ -2,19 +2,20 @@ Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ --><!-- - Testcase with table parts inside of a flex container, triggering - table-fixup. We use justify-content:space-between to stick packing + Testcase with table parts inside of a flex container, which should *not* + trigger table-fixup. We use justify-content:space-between to stick packing space between flex items, so that we can verify that e.g. a contiguous - run of <td>s will end up in the same flex item (wrapped in a table). + run of <td>s will each be blockified & form its own flex item (instead of + being aggregated into a single table & single flex item). --><html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>CSS Test: Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item</title> + <title>CSS Test: Testing that table cells in a flex container get blockified and each form their own flex item</title> <style type="text/css"> @page { font: italic 8pt sans-serif; color: gray; margin: 7%; counter-increment: page; @top-left { content: "CSS Flexible Box Layout Module Level 1 CR Test Suite"; } - @top-right { content: "Test flexbox-table-fixup-001a"; } + @top-right { content: "Test flexbox-table-fixup-001"; } @bottom-right { content: counter(page); } } </style> @@ -29,12 +30,10 @@ justify-content: space-around; } - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> td { - padding-top: 0px; - padding-bottom: 0px; + /* Remove any default padding for td elements, so we can compare them + easily against blocks in the reference case. */ + padding: 0px; } .a { @@ -54,16 +53,16 @@ </style> </head> <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> + <!-- The adjacent table-parts in each example below should *not* be + grouped into the same flex item. --> + <!-- 2 adjacent table cells --> <div class="flexbox"><td class="a">cell1</td><td class="b">cell2</td></div> - <!-- Table cell followed by tbody (they end up in the same table) --> + <!-- Table cell followed by tbody --> <div class="flexbox"><td class="a">cell1</td><tbody class="b">t</tbody></div> - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <!-- Note: We use "space-between" (instead of "space-around") here because - it makes the math cleaner. (100px split 2 ways instead of 3 ways.) --> - <div class="flexbox" style="justify-content: space-between"><td/><div class="c">div</div><td class="b">cell1</td></div> + <!-- Empty table cell (ends up occupying 2px of width), followed by + nonempty table cell.--> + <div class="flexbox"><td/><td class="b">cell1</td></div> </body> </html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-table-fixup-001b.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-table-fixup-001b.xht deleted file mode 100644 index c832ec7260e..00000000000 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-table-fixup-001b.xht +++ /dev/null @@ -1,77 +0,0 @@ -<!-- - Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ ---><!-- - Testcase with table parts inside of a flex container, triggering - table-fixup. We use justify-content:space-between to stick packing - space between flex items, so that we can verify that e.g. a contiguous - run of <td>s will end up in the same flex item (wrapped in a table). - - In this variant of the test, we also assign 'flex' values to the - table parts - these values should have no effect, since these children - don't themselves form flex items. The flex property _is_ honored on - the <div class="c">, though, because _its_ box _is_ a direct child of a - flexbox, so it _is_ a flex item. ---><html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title>CSS Test: Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items</title> - <style type="text/css"> - @page { font: italic 8pt sans-serif; color: gray; - margin: 7%; - counter-increment: page; - @top-left { content: "CSS Flexible Box Layout Module Level 1 CR Test Suite"; } - @top-right { content: "Test flexbox-table-fixup-001b"; } - @bottom-right { content: counter(page); } - } -</style> - <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/> - <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"/> - <link rel="match" href="reference/flexbox-table-fixup-001-ref.xht"/> - <style> - div.flexbox { - border: 1px dashed blue; - width: 200px; - display: flex; - justify-content: space-around; - } - - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> - td { - padding-top: 0px; - padding-bottom: 0px; - } - - .a { - background: lightgreen; - width: 48px; - flex: 5 3 100px; - } - - .b { - background: yellow; - width: 48px; - flex: 1 2 3px; - } - - .c { - background: pink; - flex: 0 0 48px; - } - </style> - </head> - <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> - <div class="flexbox"><td class="a">cell1</td><td class="b">cell2</td></div> - - <!-- Table cell followed by tbody (they end up in the same table) --> - <div class="flexbox"><td class="a">cell1</td><tbody class="b">t</tbody></div> - - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <!-- Note: We use "space-between" (instead of "space-around") here because - it makes the math cleaner. (100px split 2 ways instead of 3 ways.) --> - <div class="flexbox" style="justify-content: space-between"><td/><div class="c">div</div><td class="b">cell1</td></div> - </body> -</html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-with-pseudo-elements-003.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-with-pseudo-elements-003.xht index 3f1f97cc7c9..f4622cad58e 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-with-pseudo-elements-003.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/flexbox-with-pseudo-elements-003.xht @@ -6,10 +6,9 @@ flex container, specifically when they've got display:table-row or table-cell. - Note that we *don't* treat the table row or cell frames themselves as flex - items, because they get wrapped in an anonymous table box, and *that* is - the flex item. So, "align-self" and "order" have no effect on the - row/cell. --><html xmlns="http://www.w3.org/1999/xhtml"><head> + The table-row / table-cell 'display' values should be blockified, and the + pseudo-elements should be treated as flex items. (They should not get + wrapped in an anonymous table box.) --><html xmlns="http://www.w3.org/1999/xhtml"><head> <title>CSS Test: Testing that generated content nodes with table-part display types are wrapped with an anonymous table, which forms a flex item</title> <link href="mailto:dholbert@mozilla.com" rel="author" title="Daniel Holbert" /> <link href="http://www.w3.org/TR/css-flexbox-1/#flex-items" rel="help" /> @@ -29,15 +28,19 @@ display: table-row; content: 'b'; background: yellow; - align-self: center; /* should have no effect */ - order: 1; /* should have no effect */ + /* If these "align-self" & "order" properties impact the rendering (as + they should), that verifies we're being treated as a flex item. */ + align-self: center; + order: 1; } div.withAfter::after { display: table-cell; content: 'a'; background: lightblue; - align-self: center; /* should have no effect */ - order: -1; /* should have no effect */ + /* If these "align-self" & "order" properties impact the rendering (as + they should), that verifies we're being treated as a flex item. */ + align-self: center; + order: -1; } </style> </head> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-column-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-column-ref.xht index 3ac0639340b..45c6e583630 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-column-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-column-ref.xht @@ -25,7 +25,7 @@ <div class="item">４５６</div> <div class="item">ｄｅｆ</div> <div class="item">７８９</div> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-table-fixup-001-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-table-fixup-001-ref.xht index a03b166f39f..dad93f57af7 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-table-fixup-001-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-table-fixup-001-ref.xht @@ -1,8 +1,8 @@ <!-- Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ ---><!-- Reference case for table-fixup on table parts inside of a - flex container. --><html xmlns="http://www.w3.org/1999/xhtml"> +--><!-- Reference case for ensuring table-fixup does not happen to adjacent + table parts directly inside of a flex container. --><html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>CSS Reftest Reference</title> <style type="text/css"> @@ -18,14 +18,9 @@ <style> div.flexbox { border: 1px dashed blue; - } - - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> - td { - padding-top: 0px; - padding-bottom: 0px; + width: 200px; + display: flex; + justify-content: space-around; } .a { @@ -45,14 +40,11 @@ </style> </head> <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> - <div class="flexbox" style="padding-left: 50px; width: 150px"><td class="a">cell1</td><td class="b">cell2</td></div> + <!-- In each example here, we simply use blocks instead of table parts --> + <div class="flexbox"><div class="a">cell1</div><div class="b">cell2</div></div> - <!-- Table cell followed by tbody (they end up in the same table) --> - <div class="flexbox" style="padding-left: 75px; width: 125px"><td class="a">cell1</td><tbody class="b">t</tbody></div> + <div class="flexbox"><div class="a">cell1</div><div class="b">t</div></div> - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <div class="flexbox" style="padding-left: 52px; width: 148px"><div style="display: inline-block;" class="c">div</div><div style="display: inline-table; margin-left: 50px"><td class="b">cell1</td></div></div> + <div class="flexbox"><div/><div class="b">cell1</div></div> </body> </html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-with-pseudo-elements-003-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-with-pseudo-elements-003-ref.xht index 364f554c3c8..69df8dd4ebc 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-with-pseudo-elements-003-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-with-pseudo-elements-003-ref.xht @@ -23,10 +23,14 @@ .fakeBefore { content: 'b'; background: yellow; + align-self: center; + order: 1; } .fakeAfter { content: 'a'; background: lightblue; + align-self: center; + order: -1; } </style> </head> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest-toc.xht index bd797e69228..1719d74d30d 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest-toc.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest-toc.xht @@ -512,6 +512,54 @@ <td rowspan="1"></td> </tr> </tbody> + <tbody id="flex-aspect-ratio-img-column-001" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-001.xht">flex-aspect-ratio-img-column-001</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-column-002" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-002.xht">flex-aspect-ratio-img-column-002</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-column-003" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-column-003.xht">flex-aspect-ratio-img-column-003</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-001" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-001.xht">flex-aspect-ratio-img-row-001</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-002" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-002.xht">flex-aspect-ratio-img-row-002</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> + <tbody id="flex-aspect-ratio-img-row-003" class=""> + <tr> + <td rowspan="1" title="Aspect ratio handling of images"> + <a href="flex-aspect-ratio-img-row-003.xht">flex-aspect-ratio-img-row-003</a></td> + <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> + <td rowspan="1"></td> + </tr> + </tbody> <tbody id="flex-basis-001" class=""> <tr> <td rowspan="1" title="flex-basis - positive number"> @@ -2120,18 +2168,10 @@ <td rowspan="1"></td> </tr> </tbody> - <tbody id="flexbox-table-fixup-001a" class=""> - <tr> - <td rowspan="1" title="Testing that table cells in a flex container get an anonymous table wrapper that forms the flex item"> - <a href="flexbox-table-fixup-001a.xht">flexbox-table-fixup-001a</a></td> - <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> - <td rowspan="1"></td> - </tr> - </tbody> - <tbody id="flexbox-table-fixup-001b" class=""> + <tbody id="flexbox-table-fixup-001" class=""> <tr> - <td rowspan="1" title="Testing that the 'flex' shorthand has no effect on table cells in a flex container, since they aren't flex items"> - <a href="flexbox-table-fixup-001b.xht">flexbox-table-fixup-001b</a></td> + <td rowspan="1" title="Testing that table cells in a flex container get blockified and each form their own flex item"> + <a href="flexbox-table-fixup-001.xht">flexbox-table-fixup-001</a></td> <td><a href="reference/flexbox-table-fixup-001-ref.xht">=</a> </td> <td rowspan="1"></td> </tr> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest.list index f922a5de004..51deb4f4cf7 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest.list +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reftest.list @@ -60,6 +60,12 @@ flex-002.xht == reference/justify-content-001-ref.xht flex-003.xht == reference/justify-content-001-ref.xht flex-004.xht == reference/justify-content-001-ref.xht flex-align-items-center.xht == reference/flex-align-items-center-ref.xht +flex-aspect-ratio-img-column-001.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-column-002.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-column-003.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-row-001.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-row-002.xht == reference/ref-filled-green-100px-square.xht +flex-aspect-ratio-img-row-003.xht == reference/ref-filled-green-100px-square.xht flex-basis-001.xht == reference/ref-filled-green-100px-square.xht flex-basis-002.xht == reference/ref-filled-green-100px-square.xht flex-basis-003.xht == reference/ref-filled-green-100px-square.xht @@ -261,8 +267,7 @@ flexbox-sizing-horiz-001.xht == reference/flexbox-sizing-horiz-001-ref.xht flexbox-sizing-horiz-002.xht == reference/flexbox-sizing-horiz-002-ref.xht flexbox-sizing-vert-001.xht == reference/flexbox-sizing-vert-001-ref.xht flexbox-sizing-vert-002.xht == reference/flexbox-sizing-vert-002-ref.xht -flexbox-table-fixup-001a.xht == reference/flexbox-table-fixup-001-ref.xht -flexbox-table-fixup-001b.xht == reference/flexbox-table-fixup-001-ref.xht +flexbox-table-fixup-001.xht == reference/flexbox-table-fixup-001-ref.xht flexbox-whitespace-handling-001a.xht == reference/flexbox-whitespace-handling-001-ref.xht flexbox-whitespace-handling-001b.xht == reference/flexbox-whitespace-handling-001-ref.xht flexbox-whitespace-handling-002.xht == reference/flexbox-whitespace-handling-002-ref.xht diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht index 134ef8abb41..0569a941892 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht @@ -37,7 +37,7 @@ <tbody id="s4"> <tr><th><a href="chapter-4.xht">Chapter 4 - Flex Items</a></th> - <td>(72 Tests)</td></tr> + <td>(71 Tests)</td></tr> </tbody> <tbody id="s5"> <tr><th><a href="chapter-5.xht">Chapter 5 - @@ -62,7 +62,7 @@ <tbody id="s9"> <tr><th><a href="chapter-9.xht">Chapter 9 - Flex Layout Algorithm</a></th> - <td>(62 Tests)</td></tr> + <td>(68 Tests)</td></tr> </tbody> <tbody id="s10"> <tr><th><a href="chapter-10.xht">Chapter 10 - |