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: Floor free space by 0 in solve_inline_margins_avoiding_floats() (#37362)

Browse source 
`PlacementAmongFloats` should guarantee that the inline size of the
placement rect is at least as big as the inline size of the box,
resulting in a non-negative free space.

However, that may fail when dealing with huge sizes that need to be
saturated to MAX_AU, so this floors the free space by zero.

Testing: New crashtest
Fixes: #37312

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-06-10 11:05:09 +02:00 • committed by GitHub
parent c2ad4afcf9
commit 5c597f98e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/flow/mod.rs
View file

@ -2023,8 +2023,10 @@ fn solve_inline_margins_avoiding_floats(
placement_rect: LogicalRect<Au>, placement_rect: LogicalRect<Au>,
justify_self: AlignFlags, justify_self: AlignFlags,
) -> ((Au, Au), Au) { ) -> ((Au, Au), Au) {
let free_space = placement_rect.size.inline - inline_size; // PlacementAmongFloats should guarantee that the inline size of the placement rect
debug_assert!(free_space >= Au::zero()); // is at least as big as `inline_size`. However, that may fail when dealing with
// huge sizes that need to be saturated to MAX_AU, so floor by zero. See #37312.
let free_space = Au::zero().max(placement_rect.size.inline - inline_size);
let cb_info = &sequential_layout_state.floats.containing_block_info; let cb_info = &sequential_layout_state.floats.containing_block_info;
let start_adjustment = placement_rect.start_corner.inline - cb_info.inline_start; let start_adjustment = placement_rect.start_corner.inline - cb_info.inline_start;
let end_adjustment = cb_info.inline_end - placement_rect.max_inline_position(); let end_adjustment = cb_info.inline_end - placement_rect.max_inline_position();

7
tests/wpt/meta/MANIFEST.json vendored
View file

@ -480,6 +480,13 @@
null, null,
{} {}
] ]
],
"huge-width-after-float.html": [
"8e4d04399ff1ed4ca934c9a6c79711fcfb881f69",
[
null,
{}
]
] ]
}, },
"floats-saturated-position-crash.html": [ "floats-saturated-position-crash.html": [

6
tests/wpt/tests/css/CSS2/floats/crashtests/huge-width-after-float.html vendored Normal file
View file

@ -0,0 +1,6 @@
<!DOCTYPE html>
<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
<link rel="help" href="https://github.com/servo/servo/issues/37312">
<div style="float: left"></div>
<div style="width: 10000000000px; overflow: scroll"></div>