mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
make ContainingBlock use Au for inline_size and block_size (#31370)
This commit is contained in:
parent
2fa76916d3
commit
74c07db56c
9 changed files with 83 additions and 86 deletions
|
@ -136,10 +136,10 @@ impl LogicalVec2<LengthPercentageOrAuto<'_>> {
|
|||
LogicalVec2 {
|
||||
inline: self
|
||||
.inline
|
||||
.percentage_relative_to(containing_block.inline_size),
|
||||
block: self
|
||||
.block
|
||||
.maybe_percentage_relative_to(containing_block.block_size.non_auto()),
|
||||
.percentage_relative_to(containing_block.inline_size.into()),
|
||||
block: self.block.maybe_percentage_relative_to(
|
||||
containing_block.block_size.map(|t| t.into()).non_auto(),
|
||||
),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -152,9 +152,11 @@ impl LogicalVec2<Option<&'_ LengthPercentage>> {
|
|||
LogicalVec2 {
|
||||
inline: self
|
||||
.inline
|
||||
.map(|lp| lp.percentage_relative_to(containing_block.inline_size)),
|
||||
.map(|lp| lp.percentage_relative_to(containing_block.inline_size.into())),
|
||||
block: self.block.and_then(|lp| {
|
||||
lp.maybe_percentage_relative_to(containing_block.block_size.non_auto())
|
||||
lp.maybe_percentage_relative_to(
|
||||
containing_block.block_size.map(|t| t.into()).non_auto(),
|
||||
)
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue