mirror of
https://github.com/servo/servo.git
synced 2025-10-01 00:59:15 +01:00
Implement keyword sizes for intrinsic contributions (#33854)
Correctly handle keyword sizes when computing the min-content or max-content contribution of a box. Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau
GitHub
parent
831a65917a
commit
faeb31d6c6
5 changed files with 209 additions and 42 deletions
7
tests/wpt/meta/MANIFEST.json
vendored
7
tests/wpt/meta/MANIFEST.json
vendored
|
|
@ -569314,6 +569314,13 @@
|
|||
{}
|
||||
]
|
||||
],
|
||||
"keyword-sizes-for-intrinsic-contributions.tentative.html": [
|
||||
"5f135d8181b023134eb24e5ec34957e3a25e6765",
|
||||
[
|
||||
null,
|
||||
{}
|
||||
]
|
||||
],
|
||||
"keyword-sizes-on-floated-element.html": [
|
||||
"42ea7ba26d7e1ffd26f8f12bad37e3b18abba0f6",
|
||||
[
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
[intrinsic-percent-replaced-dynamic-011.html]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[intrinsic-percent-replaced-dynamic-012.html]
|
||||
expected: FAIL
|
||||
114
tests/wpt/tests/css/css-sizing/keyword-sizes-for-intrinsic-contributions.tentative.html
vendored
Normal file
114
tests/wpt/tests/css/css-sizing/keyword-sizes-for-intrinsic-contributions.tentative.html
vendored
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
<!DOCTYPE html>
|
||||
<title>Keyword sizes for intrinsic contributions</title>
|
||||
<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#sizing-values">
|
||||
<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#sizing-values">
|
||||
<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-contribution">
|
||||
<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10721">
|
||||
<meta assert="The various keyword sizes produce the right min/max-content contributions.">
|
||||
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
|
||||
|
||||
<style>
|
||||
.wrapper {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
margin-right: 200px;
|
||||
}
|
||||
|
||||
.test {
|
||||
float: left;
|
||||
clear: both;
|
||||
margin: 5px;
|
||||
border: 3px solid;
|
||||
padding: 2px;
|
||||
font: 20px/1 Ahem;
|
||||
}
|
||||
|
||||
/* Set the preferred size to small amount, to test that the min size works */
|
||||
.test.min-width > div { width: 0px }
|
||||
.test.min-height > div { height: 0px }
|
||||
|
||||
/* Set the preferred size to big amount, to test that the max size works */
|
||||
.test.max-width > div { width: 200px }
|
||||
.test.max-height > div { height: 200px }
|
||||
|
||||
/* stretch isn't widely supported, fall back to vendor-prefixed alternatives */
|
||||
.width > .stretch { width: -moz-available; width: -webkit-fill-available; width: stretch }
|
||||
.min-width > .stretch { min-width: -moz-available; min-width: -webkit-fill-available; min-width: stretch }
|
||||
.max-width > .stretch { max-width: -moz-available; max-width: -webkit-fill-available; max-width: stretch }
|
||||
.height > .stretch { height: -moz-available; height: -webkit-fill-available; height: stretch }
|
||||
.min-height > .stretch { min-height: -moz-available; min-height: -webkit-fill-available; min-height: stretch }
|
||||
.max-height > .stretch { max-height: -moz-available; max-height: -webkit-fill-available; max-height: stretch }
|
||||
</style>
|
||||
<div id="log"></div>
|
||||
|
||||
<!-- Preferred width -->
|
||||
<div class="wrapper" style="width: 0px">
|
||||
<div class="test width" data-expected-width="70"><div style="width: min-content">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="70"><div style="width: fit-content">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="70"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="150"><div style="width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
<div class="wrapper" style="width: 100px">
|
||||
<div class="test width" data-expected-width="70"><div style="width: min-content">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="90"><div style="width: fit-content">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="90"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="150"><div style="width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
<div class="wrapper" style="width: 200px">
|
||||
<div class="test width" data-expected-width="70"><div style="width: min-content">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="150"><div style="width: fit-content">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="150"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test width" data-expected-width="150"><div style="width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<!-- Minimum width -->
|
||||
<div class="wrapper" style="width: 0px">
|
||||
<div class="test min-width" data-expected-width="70"><div style="min-width: min-content">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="70"><div style="min-width: fit-content">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="70"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="150"><div style="min-width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
<div class="wrapper" style="width: 100px">
|
||||
<div class="test min-width" data-expected-width="70"><div style="min-width: min-content">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="90"><div style="min-width: fit-content">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="90"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="150"><div style="min-width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
<div class="wrapper" style="width: 200px">
|
||||
<div class="test min-width" data-expected-width="70"><div style="min-width: min-content">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="150"><div style="min-width: fit-content">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="150"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test min-width" data-expected-width="150"><div style="min-width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<!-- Maximum width -->
|
||||
<div class="wrapper" style="width: 0px">
|
||||
<div class="test max-width" data-expected-width="70"><div style="max-width: min-content">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="70"><div style="max-width: fit-content">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="70"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="150"><div style="max-width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
<div class="wrapper" style="width: 100px">
|
||||
<div class="test max-width" data-expected-width="70"><div style="max-width: min-content">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="90"><div style="max-width: fit-content">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="90"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="150"><div style="max-width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
<div class="wrapper" style="width: 200px">
|
||||
<div class="test max-width" data-expected-width="70"><div style="max-width: min-content">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="150"><div style="max-width: fit-content">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="150"><div class="stretch">XXX XXX</div></div>
|
||||
<div class="test max-width" data-expected-width="150"><div style="max-width: max-content">XXX XXX</div></div>
|
||||
</div>
|
||||
|
||||
<script src="/resources/testharness.js"></script>
|
||||
<script src="/resources/testharnessreport.js"></script>
|
||||
<script src="/resources/check-layout-th.js"></script>
|
||||
<script>
|
||||
checkLayout(".test");
|
||||
</script>
|
||||
Loading…
Add table
Add a link
Reference in a new issue