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

Prevent margins from collapsing through when separated by clearance

Browse source 
This fixes #29884 and improves #29896.
This commit is contained in:
Oriol Brufau 2023-06-20 17:15:38 +02:00
parent 47fb54fc54
commit 00a5a4e6c4
15 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/layout_2020/flow/mod.rs
View file

@ -572,6 +572,7 @@ fn layout_in_flow_non_replaced_block_level(
collapsible_margins_in_children.collapsed_through && collapsible_margins_in_children.collapsed_through &&
block_is_same_formatting_context && block_is_same_formatting_context &&
pbm.padding_border_sums.block == Length::zero() && pbm.padding_border_sums.block == Length::zero() &&
clearance == Length::zero() &&
block_size.auto_is(|| Length::zero()) == Length::zero() && block_size.auto_is(|| Length::zero()) == Length::zero() &&
min_box_size.block == Length::zero(); min_box_size.block == Length::zero();
}, },

2
tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/clear-after-top-margin.html.ini
View file

@ -1,2 +0,0 @@
[clear-after-top-margin.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini
View file

@ -1,2 +0,0 @@
[margin-collapse-018.xht]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini
View file

@ -1,2 +0,0 @@
[margin-collapse-027.xht]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html.ini Normal file
View file

@ -0,0 +1,2 @@
[no-clearance-due-to-large-margin-after-left-right.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html.ini
View file

@ -1,2 +0,0 @@
[remove-block-before-self-collapsing-sibling-with-clearance.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap-reverse.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_flow-row-wrap-reverse.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_flow-row-wrap.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_item-float.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_item-top-float.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_item-vertical-align.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-long.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_wrap-long.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-reverse.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_wrap-reverse.html]
expected: FAIL

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

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

2
tests/wpt/mozilla/meta-layout-2020/css/acid1_a.html.ini
View file

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