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

Obey min-height and max-height on floated elements (#32057)

Browse source 
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Oriol Brufau 2024-04-12 12:21:02 +02:00 • committed by GitHub
parent 88d4aff595
commit e9591ce62f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout_2020/flow/float.rs
View file

@ -938,13 +938,16 @@ impl FloatBox {
}); });
let inline_size = tentative_inline_size let inline_size = tentative_inline_size
.clamp_between_extremums(min_box_size.inline, max_box_size.inline); .clamp_between_extremums(min_box_size.inline, max_box_size.inline);
let block_size = box_size.block.map(|size| {
size.clamp_between_extremums(min_box_size.block, max_box_size.block)
});
// Calculate block size. // Calculate block size.
// https://drafts.csswg.org/css2/#block-root-margin // https://drafts.csswg.org/css2/#block-root-margin
// FIXME(pcwalton): Is a tree rank of zero correct here? // FIXME(pcwalton): Is a tree rank of zero correct here?
let containing_block_for_children = ContainingBlock { let containing_block_for_children = ContainingBlock {
inline_size: inline_size.into(), inline_size: inline_size.into(),
block_size: box_size.block.map(|t| t.into()), block_size: block_size.map(|t| t.into()),
style: &non_replaced.style, style: &non_replaced.style,
}; };
let independent_layout = non_replaced.layout( let independent_layout = non_replaced.layout(
@ -955,9 +958,10 @@ impl FloatBox {
); );
content_size = LogicalVec2 { content_size = LogicalVec2 {
inline: inline_size, inline: inline_size,
block: box_size block: block_size.auto_is(|| {
.block Length::from(independent_layout.content_block_size)
.auto_is(|| independent_layout.content_block_size.into()), .clamp_between_extremums(min_box_size.block, max_box_size.block)
}),
}; };
children = independent_layout.fragments; children = independent_layout.fragments;
}, },

2
tests/wpt/meta/css/CSS2/normal-flow/min-height-106.xht.ini
View file

@ -1,2 +0,0 @@
[min-height-106.xht]
expected: FAIL

2
tests/wpt/meta/css/css-flexbox/flex-vertical-align-effect.html.ini
View file

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