From c17dddb27dbd8103a577e12a83384d1e1b35a33e Mon Sep 17 00:00:00 2001 From: Oriol Brufau Date: Mon, 23 Dec 2024 14:36:16 -0800 Subject: [PATCH] layout: Pass the right containing block to `find_block_margin_collapsing_with_parent_from_slice()` (#34725) Signed-off-by: Oriol Brufau --- components/layout_2020/flow/mod.rs | 2 +- ...collapse-and-fit-content-and-padding-percentage-003.html.ini | 2 -- ...collapse-and-fit-content-and-padding-percentage-004.html.ini | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-003.html.ini delete mode 100644 tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-004.html.ini diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index 62bb828374a..185143f425c 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -886,7 +886,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context( layout_context, child_boxes, &mut block_start_margin, - containing_block, + &containing_block_for_children, ); } } diff --git a/tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-003.html.ini b/tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-003.html.ini deleted file mode 100644 index f7395d94874..00000000000 --- a/tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-003.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-004.html.ini b/tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-004.html.ini deleted file mode 100644 index 211086a4c08..00000000000 --- a/tests/wpt/meta/css/css-sizing/float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[float-clearance-with-margin-collapse-and-fit-content-and-padding-percentage-004.html] - expected: FAIL