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

Auto merge of #29750 - stshine:fix-flex-resolve, r=mrobinson

Browse source 
layout_2020: fix target main size not get clamped in flexbox

When Resolving flexible lengths, the clamp result of item's target main size is not actually saved when it should.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] There are tests for these changes OR

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2023-05-22 17:51:57 +02:00 • committed by GitHub
commit b1f9126163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 7 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -943,6 +943,8 @@ impl FlexLine<'_> {
// it’s a min violation.”
for (item_and_target_main_size, frozen) in items() {
if violation(item_and_target_main_size) > Length::zero() {
let (item, target_main_size) = item_and_target_main_size;
target_main_size.set(item.content_min_size.main);
frozen_count.set(frozen_count.get() + 1);
frozen.set(true);
}
@ -954,6 +956,11 @@ impl FlexLine<'_> {
// it’s a max violation.”
for (item_and_target_main_size, frozen) in items() {
if violation(item_and_target_main_size) < Length::zero() {
let (item, target_main_size) = item_and_target_main_size;
let Some(max_size) = item.content_max_size.main else {
unreachable!()
};
target_main_size.set(max_size);
frozen_count.set(frozen_count.get() + 1);
frozen.set(true);
}

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-008.html.ini
View file

@ -1,2 +0,0 @@
[flex-grow-008.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-center.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-center.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-end.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-flex-end.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-start.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-flex-start.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound-only.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacearound-only.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacearound.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacebetween-only.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacebetween.html]
expected: FAIL

15
tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
View file

@ -1,7 +1,4 @@
[image-as-flexitem-size-005.html]
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 18]
expected: FAIL
@ -25,15 +22,3 @@
[.flexbox > img 2]
expected: FAIL
[.flexbox > img 14]
expected: FAIL
[.flexbox > img 17]
expected: FAIL
[.flexbox > img 12]
expected: FAIL
[.flexbox > img 9]
expected: FAIL

15
tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
View file

@ -1,19 +1,4 @@
[image-as-flexitem-size-005v.html]
[.flexbox > img 9]
expected: FAIL
[.flexbox > img 12]
expected: FAIL
[.flexbox > img 14]
expected: FAIL
[.flexbox > img 17]
expected: FAIL
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 18]
expected: FAIL

3
tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
View file

@ -1,6 +1,3 @@
[percentage-heights-012.html]
[.flexbox 9]
expected: FAIL
[.flexbox 10]
expected: FAIL