Correct rendering of floated root

Fix two issues around floating a root element:

1. In the StackingContext code handle the case where a root element is a
   Float fragment and not a Box fragment. This fixes a debug assertion
   failure in the css/CSS2/float/float-root.html test.
2. When initializing the SequentialLayoutState, use the containing block
   width as the maximum inline float placement position instead of
   infinity. This fixes the rendering of css/CSS2/float/float-root.html.

Note that css/CSS2/float/float-root.html was passing before, because
both the test and reference were subject to the same bug. This fixes a
couple other tests as well.
This commit is contained in:
Martin Robinson 2023-06-14 13:00:09 +02:00
parent ffccc5c88b
commit 4cb4332602
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
8 changed files with 17 additions and 31 deletions

View file

@ -61,23 +61,13 @@ pub struct ContainingBlockPositionInfo {
pub inline_end: Length,
}
impl Default for ContainingBlockPositionInfo {
fn default() -> Self {
Self {
block_start: Length::zero(),
block_start_margins_not_collapsed: CollapsedMargin::zero(),
inline_start: Length::zero(),
inline_end: Length::new(f32::INFINITY),
}
}
}
impl ContainingBlockPositionInfo {
pub fn new_with_inline_offsets(inline_start: Length, inline_end: Length) -> Self {
Self {
block_start: Length::zero(),
block_start_margins_not_collapsed: CollapsedMargin::zero(),
inline_start,
inline_end,
..Default::default()
}
}
}
@ -109,7 +99,7 @@ pub struct FloatContext {
impl FloatContext {
/// Returns a new float context representing a containing block with the given content
/// inline-size.
pub fn new() -> Self {
pub fn new(max_inline_size: Length) -> Self {
let mut bands = FloatBandTree::new();
bands = bands.insert(FloatBand {
top: Length::zero(),
@ -124,7 +114,10 @@ impl FloatContext {
FloatContext {
bands,
ceiling: Length::zero(),
containing_block_info: Default::default(),
containing_block_info: ContainingBlockPositionInfo::new_with_inline_offsets(
Length::zero(),
max_inline_size,
),
clear_left_position: Length::zero(),
clear_right_position: Length::zero(),
}
@ -827,9 +820,9 @@ pub(crate) struct SequentialLayoutState {
impl SequentialLayoutState {
/// Creates a new empty `SequentialLayoutState`.
pub(crate) fn new() -> SequentialLayoutState {
pub(crate) fn new(max_inline_size: Length) -> SequentialLayoutState {
SequentialLayoutState {
floats: FloatContext::new(),
floats: FloatContext::new(max_inline_size),
current_margin: CollapsedMargin::zero(),
bfc_relative_block_position: Length::zero(),
}

View file

@ -80,7 +80,7 @@ impl BlockFormattingContext {
tree_rank: usize,
) -> IndependentLayout {
let mut sequential_layout_state = if self.contains_floats || !layout_context.use_rayon {
Some(SequentialLayoutState::new())
Some(SequentialLayoutState::new(containing_block.inline_size))
} else {
None
};