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

Enable min-content, max-content, fit-content and stretch (#33492)

Browse source 
For the sizing properties.

We don't actually support them yet, just treating them as
the initial value.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Oriol Brufau 2024-09-20 16:48:27 +02:00 • committed by GitHub
parent 4bde9af515
commit 9597390d2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 120 additions and 2798 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/layout/block.rs
View file

@ -419,24 +419,24 @@ impl CandidateBSizeIterator {
// If that is not determined yet by the time we need to resolve
// `min-height` and `max-height`, percentage values are ignored.
let block_size = match fragment.style.content_block_size() {
Size::Auto => MaybeAuto::Auto,
Size::LengthPercentage(ref lp) => {
MaybeAuto::from_option(lp.maybe_to_used_value(block_container_block_size))
},
};
let block_size = MaybeAuto::from_option(
fragment
.style
.content_block_size()
.maybe_to_used_value(block_container_block_size),
);
let max_block_size = match fragment.style.max_block_size() {
MaxSize::None => None,
MaxSize::LengthPercentage(ref lp) => lp.maybe_to_used_value(block_container_block_size),
};
let max_block_size = fragment
.style
.max_block_size()
.maybe_to_used_value(block_container_block_size);
let min_block_size = match fragment.style.min_block_size() {
Size::Auto => MaybeAuto::Auto,
Size::LengthPercentage(ref lp) => {
MaybeAuto::from_option(lp.maybe_to_used_value(block_container_block_size))
},
}
let min_block_size = MaybeAuto::from_option(
fragment
.style
.min_block_size()
.maybe_to_used_value(block_container_block_size),
)
.specified_or_zero();
// If the style includes `box-sizing: border-box`, subtract the border and padding.
@ -1402,7 +1402,8 @@ impl BlockFlow {
let content_block_size = self.fragment.style().content_block_size();
match content_block_size {
Size::Auto => {
Size::LengthPercentage(ref lp) => lp.maybe_to_used_value(containing_block_size),
_ => {
let container_size = containing_block_size?;
let (block_start, block_end) = {
let position = self.fragment.style().logical_position();
@ -1437,7 +1438,6 @@ impl BlockFlow {
(_, _) => None,
}
},
Size::LengthPercentage(ref lp) => lp.maybe_to_used_value(containing_block_size),
}
}
@ -2167,10 +2167,13 @@ impl Flow for BlockFlow {
// If this block has a fixed width, just use that for the minimum and preferred width,
// rather than bubbling up children inline width.
// FIXME(emilio): This should probably be writing-mode-aware.
let consult_children = match self.fragment.style().get_position().width {
Size::Auto => true,
Size::LengthPercentage(ref lp) => lp.maybe_to_used_value(None).is_none(),
};
let consult_children = self
.fragment
.style()
.get_position()
.width
.maybe_to_used_value(None)
.is_none();
self.bubble_inline_sizes_for_block(consult_children);
self.fragment
.restyle_damage