mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Make computed types hold Percentage instead of bare CSSFloat
This commit is contained in:
parent
4b633c8637
commit
608e7f71a2
22 changed files with 140 additions and 110 deletions
|
@ -46,7 +46,7 @@ impl AxisSize {
|
|||
LengthOrPercentageOrAuto::Length(length) => AxisSize::Definite(length),
|
||||
LengthOrPercentageOrAuto::Percentage(percent) => {
|
||||
match content_size {
|
||||
Some(size) => AxisSize::Definite(size.scale_by(percent)),
|
||||
Some(size) => AxisSize::Definite(size.scale_by(percent.0)),
|
||||
None => AxisSize::Infinite
|
||||
}
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ fn from_flex_basis(flex_basis: LengthOrPercentageOrAutoOrContent,
|
|||
(LengthOrPercentageOrAutoOrContent::Length(length), _) =>
|
||||
MaybeAuto::Specified(length),
|
||||
(LengthOrPercentageOrAutoOrContent::Percentage(percent), Some(size)) =>
|
||||
MaybeAuto::Specified(size.scale_by(percent)),
|
||||
MaybeAuto::Specified(size.scale_by(percent.0)),
|
||||
(LengthOrPercentageOrAutoOrContent::Percentage(_), None) =>
|
||||
MaybeAuto::Auto,
|
||||
(LengthOrPercentageOrAutoOrContent::Calc(calc), _) =>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue