use au in AtomicLineItem (#32630)

This commit is contained in:
atbrakhi 2024-06-27 13:12:32 +02:00 committed by GitHub
parent 9ff900e166
commit fced0b4940
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -444,7 +444,7 @@ impl InlineBoxLineItem {
pub(super) struct AtomicLineItem { pub(super) struct AtomicLineItem {
pub fragment: BoxFragment, pub fragment: BoxFragment,
pub size: LogicalVec2<Length>, pub size: LogicalVec2<Au>,
pub positioning_context: Option<PositioningContext>, pub positioning_context: Option<PositioningContext>,
/// The block offset of this items' baseline relative to the baseline of the line. /// The block offset of this items' baseline relative to the baseline of the line.
@ -474,7 +474,7 @@ impl AtomicLineItem {
&relative_adjustement(&self.fragment.style, state.ifc_containing_block); &relative_adjustement(&self.fragment.style, state.ifc_containing_block);
} }
state.inline_position += self.size.inline; state.inline_position += self.size.inline.into();
if let Some(mut positioning_context) = self.positioning_context { if let Some(mut positioning_context) = self.positioning_context {
positioning_context.adjust_static_position_of_hoisted_fragments_with_offset( positioning_context.adjust_static_position_of_hoisted_fragments_with_offset(
@ -493,7 +493,7 @@ impl AtomicLineItem {
match self.fragment.style.clone_vertical_align() { match self.fragment.style.clone_vertical_align() {
GenericVerticalAlign::Keyword(VerticalAlignKeyword::Top) => Length::zero(), GenericVerticalAlign::Keyword(VerticalAlignKeyword::Top) => Length::zero(),
GenericVerticalAlign::Keyword(VerticalAlignKeyword::Bottom) => { GenericVerticalAlign::Keyword(VerticalAlignKeyword::Bottom) => {
line_metrics.block_size - self.size.block line_metrics.block_size - self.size.block.into()
}, },
// This covers all baseline-relative vertical alignment. // This covers all baseline-relative vertical alignment.