Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix intrinsic sizing of column flex containers (#33299)

Browse source 
From https://drafts.csswg.org/css-flexbox-1/#intrinsic-cross-sizes,
> The min-content/max-content cross size of a single-line flex container
> is the largest min-content contribution/max-content contribution
> (respectively) of its flex items.

We were using the min/max-content size instead of the min/max-content
contribution.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-09-04 08:44:31 +02:00 • committed by GitHub
parent e43e477842
commit 27d87f104e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 3 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout_2020/flexbox/layout.rs
View file

@ -361,13 +361,11 @@ impl FlexContainer {
// columns, and sum the column sizes and gaps.
// TODO: Use the proper automatic minimum size.
let ifc = &mut item.independent_formatting_context;
content_sizes.max_assign(ifc.inline_content_sizes(
content_sizes.max_assign(ifc.outer_inline_content_sizes(
layout_context,
&containing_block_for_children.new_for_intrinsic_inline_size_of_child(
&ifc.style().clone(),
&LogicalVec2::zero(),
),
containing_block_for_children,
&LogicalVec2::zero(),
false, /* auto_block_size_stretches_to_containing_block */
));
},
FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => {},

6
tests/wpt/meta/css/css-flexbox/flex-item-contains-strict.html.ini vendored
View file

@ -5,12 +5,6 @@
[.inline-flex 6]
expected: FAIL
[.inline-flex 3]
expected: FAIL
[.inline-flex 7]
expected: FAIL
[.inline-flex 1]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-justify-content-vert-001a.xhtml]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-justify-content-vert-002.xhtml]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-justify-content-vert-003.xhtml]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-justify-content-vert-004.xhtml]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-001.html.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-min-height-auto-001.html]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002a.html.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-min-height-auto-002a.html]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002b.html.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-min-height-auto-002b.html]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002c.html.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-min-height-auto-002c.html]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-003.html.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-min-height-auto-003.html]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-004.html.ini vendored
View file

@ -1,2 +0,0 @@
[flexbox-min-height-auto-004.html]
expected: FAIL

18
tests/wpt/meta/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini vendored
View file

@ -1,16 +1,10 @@
[inline-flexbox-wrap-vertically-width-calculation.html]
[.inline-flexbox 13]
expected: FAIL
[.inline-flexbox 12]
expected: FAIL
[.inline-flexbox 11]
expected: FAIL
[.inline-flexbox 10]
expected: FAIL
[.inline-flexbox 16]
expected: FAIL
@ -23,26 +17,14 @@
[.inline-flexbox 3]
expected: FAIL
[.inline-flexbox 2]
expected: FAIL
[.inline-flexbox 7]
expected: FAIL
[.inline-flexbox 6]
expected: FAIL
[.inline-flexbox 5]
expected: FAIL
[.inline-flexbox 4]
expected: FAIL
[.inline-flexbox 8]
expected: FAIL
[.inline-flexbox 1]
expected: FAIL
[.inline-flexbox 9]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/multiline-shrink-to-fit.html.ini vendored
View file

@ -1,2 +0,0 @@
[multiline-shrink-to-fit.html]
expected: FAIL

12
tests/wpt/meta/css/css-flexbox/overflow-auto-006.html.ini vendored
View file

@ -1,12 +0,0 @@
[overflow-auto-006.html]
[.flexbox, .inline-flexbox 7]
expected: FAIL
[.flexbox, .inline-flexbox 8]
expected: FAIL
[.flexbox, .inline-flexbox 9]
expected: FAIL
[.flexbox, .inline-flexbox 10]
expected: FAIL