Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Let align-content: stretch fall back to unsafe flex-start (#37708)

Browse source 
This aligns Servo with other browsers, and adopts this CSSWG resolution:
https://github.com/w3c/csswg-drafts/issues/11641#issuecomment-3005385155

Testing: adding new WPT test, and some expectation changes for existing
tests.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-06-26 15:53:28 +02:00 • committed by GitHub
parent d4c0d2ecbb
commit a9dc2ac83a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 47 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/flexbox/layout.rs
View file

@ -802,7 +802,7 @@ impl FlexContainer {
if fallback_is_needed { if fallback_is_needed {
(resolved_align_content, is_safe) = match resolved_align_content { (resolved_align_content, is_safe) = match resolved_align_content {
AlignFlags::STRETCH => (AlignFlags::FLEX_START, true), AlignFlags::STRETCH => (AlignFlags::FLEX_START, false),
AlignFlags::SPACE_BETWEEN => (AlignFlags::FLEX_START, true), AlignFlags::SPACE_BETWEEN => (AlignFlags::FLEX_START, true),
AlignFlags::SPACE_AROUND => (AlignFlags::CENTER, true), AlignFlags::SPACE_AROUND => (AlignFlags::CENTER, true),
AlignFlags::SPACE_EVENLY => (AlignFlags::CENTER, true), AlignFlags::SPACE_EVENLY => (AlignFlags::CENTER, true),

13
tests/wpt/meta/MANIFEST.json vendored
View file

@ -170987,6 +170987,19 @@
{} {}
] ]
], ],
"align-content-007.htm": [
"33d217d1671898f43c3e221dd6305401298eab6a",
[
null,
[
[
"/css/reference/ref-filled-green-200px-square.html",
"=="
]
],
{}
]
],
"align-content-wrap-004.html": [ "align-content-wrap-004.html": [
"161832190a2a3088ab3b9ad198d4e3083a291551", "161832190a2a3088ab3b9ad198d4e3083a291551",
[ [

2
tests/wpt/meta/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-align-self-baseline-horiz-003.xhtml]
expected: FAIL

3
tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini vendored
View file

@ -5,6 +5,9 @@
[.flexbox 11] [.flexbox 11]
expected: FAIL expected: FAIL
[.flexbox 5]
expected: FAIL
[.flexbox 8] [.flexbox 8]
expected: FAIL expected: FAIL

30
tests/wpt/tests/css/css-flexbox/align-content-007.htm vendored Normal file
View file

@ -0,0 +1,30 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title>CSS Test: Fallback alignment of 'align-content: stretch'</title>
<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
<link rel="help" href="https://drafts.csswg.org/css-align/#valdef-align-content-stretch">
<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11641">
<meta name="assert" content="The fallback alignment for `align-content: stretch` is `flex-start`, not `safe flex-start`.">
<link rel="match" href="../reference/ref-filled-green-200px-square.html">
<style>
#flex {
display: flex;
width: 200px;
height: 200px;
flex-wrap: wrap-reverse;
align-content: stretch;
}
#item {
width: 200px;
height: 400px;
background: linear-gradient(to bottom, red 50%, green 50%);
}
</style>
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
<div style="overflow: hidden">
<div id="flex">
<div id="item"></div>
</div>
</div>