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

layout: Lay out grid items with a consistent tentative block size (#37981)

Browse source 
When laying out a grid item, the tentative block size that is used to
determine the intrinsic inline sizes was different than the one used in
the containing block for the contents. The latter is now used for both
cases.

Testing: A test is now passing.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-07-10 21:46:21 +02:00 • committed by GitHub
parent a02877e6b4
commit e14556959d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/layout/taffy/layout.rs
View file

@ -206,19 +206,21 @@ impl taffy::LayoutPartialTree for TaffyContainerContext<'_> {
..taffy::LayoutOutput::DEFAULT
}
} else {
// TODO: pass min- and max- size
let tentative_block_size = content_box_known_dimensions
.height
.map(Au::from_f32_px)
.map_or_else(SizeConstraint::default, SizeConstraint::Definite);
// Compute inline size
let inline_size = content_box_known_dimensions.width.unwrap_or_else(|| {
let constraint_space = ConstraintSpace {
// TODO: pass min- and max- size
block_size: SizeConstraint::new(
inputs.parent_size.height.map(Au::from_f32_px),
Au::zero(),
None,
),
block_size: tentative_block_size,
writing_mode,
preferred_aspect_ratio,
};
// TODO: pass min- and max- size
let result = independent_context
.inline_content_sizes(self.layout_context, &constraint_space);
let adjusted_available_space = inputs
@ -243,10 +245,7 @@ impl taffy::LayoutPartialTree for TaffyContainerContext<'_> {
let content_box_size_override = ContainingBlock {
size: ContainingBlockSize {
inline: Au::from_f32_px(inline_size),
block: content_box_known_dimensions
.height
.map(Au::from_f32_px)
.map_or_else(SizeConstraint::default, SizeConstraint::Definite),
block: tentative_block_size,
},
style,
};

2
tests/wpt/meta/css/css-grid/grid-items/grid-item-inline-contribution-001.html.ini vendored
View file

@ -1,2 +0,0 @@
[grid-item-inline-contribution-001.html]
expected: FAIL