mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Fix inline content sizes of intrinsic element with indefinite block size (#34152)
To compute the min-content and max-content inline sizes of a replaced element, we were only using the aspect ratio to transfer definite block sizes resulting from clamping the preferred block size between the min and max block sizes. However, if the preferred block size is indefinite, then we weren't transfering the min and max through the aspect ratio. This patch adds a `SizeConstraint` enum that can represent these cases, and a `ConstraintSpace` struct analogous to `IndefiniteContainingBlock` but with no inline size, and a `SizeConstraint` block size. Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
parent
72971bd271
commit
b28260aa13
15 changed files with 297 additions and 292 deletions
|
@ -14,7 +14,7 @@ use style::Zero;
|
|||
|
||||
use crate::geom::Size;
|
||||
use crate::style_ext::{Clamp, ComputedValuesExt, ContentBoxSizesAndPBM};
|
||||
use crate::{AuOrAuto, IndefiniteContainingBlock, LogicalVec2};
|
||||
use crate::{ConstraintSpace, IndefiniteContainingBlock, LogicalVec2, SizeConstraint};
|
||||
|
||||
#[derive(PartialEq)]
|
||||
pub(crate) enum IntrinsicSizingMode {
|
||||
|
@ -120,7 +120,7 @@ pub(crate) fn outer_inline(
|
|||
containing_block: &IndefiniteContainingBlock,
|
||||
auto_minimum: &LogicalVec2<Au>,
|
||||
auto_block_size_stretches_to_containing_block: bool,
|
||||
get_content_size: impl FnOnce(&IndefiniteContainingBlock) -> InlineContentSizesResult,
|
||||
get_content_size: impl FnOnce(&ConstraintSpace) -> InlineContentSizesResult,
|
||||
) -> InlineContentSizesResult {
|
||||
let ContentBoxSizesAndPBM {
|
||||
content_box_size,
|
||||
|
@ -140,7 +140,7 @@ pub(crate) fn outer_inline(
|
|||
.block
|
||||
.non_auto()
|
||||
.map(|v| Au::zero().max(v - pbm_sums.block));
|
||||
let block_size = if content_box_size.block.is_initial() &&
|
||||
let preferred_block_size = if content_box_size.block.is_initial() &&
|
||||
auto_block_size_stretches_to_containing_block
|
||||
{
|
||||
depends_on_block_constraints = true;
|
||||
|
@ -149,24 +149,18 @@ pub(crate) fn outer_inline(
|
|||
content_box_size
|
||||
.block
|
||||
.maybe_resolve_extrinsic(available_block_size)
|
||||
}
|
||||
.map(|block_size| {
|
||||
let min_block_size = content_min_box_size
|
||||
.block
|
||||
.maybe_resolve_extrinsic(available_block_size)
|
||||
.unwrap_or(auto_minimum.block);
|
||||
let max_block_size = content_max_box_size
|
||||
.block
|
||||
.maybe_resolve_extrinsic(available_block_size);
|
||||
block_size.clamp_between_extremums(min_block_size, max_block_size)
|
||||
})
|
||||
.map_or(AuOrAuto::Auto, AuOrAuto::LengthPercentage);
|
||||
let containing_block_for_children =
|
||||
IndefiniteContainingBlock::new_for_writing_mode_and_block_size(
|
||||
style.writing_mode,
|
||||
block_size,
|
||||
);
|
||||
get_content_size(&containing_block_for_children)
|
||||
};
|
||||
let min_block_size = content_min_box_size
|
||||
.block
|
||||
.maybe_resolve_extrinsic(available_block_size)
|
||||
.unwrap_or(auto_minimum.block);
|
||||
let max_block_size = content_max_box_size
|
||||
.block
|
||||
.maybe_resolve_extrinsic(available_block_size);
|
||||
get_content_size(&ConstraintSpace::new(
|
||||
SizeConstraint::new(preferred_block_size, min_block_size, max_block_size),
|
||||
style.writing_mode,
|
||||
))
|
||||
});
|
||||
let resolve_non_initial = |inline_size| {
|
||||
Some(match inline_size {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue