aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout_2020/flexbox/layout.rs
diff options
context:
space:
mode:
authoratbrakhi <atbrakhi@igalia.com>2024-09-10 23:35:17 +0200
committerGitHub <noreply@github.com>2024-09-10 21:35:17 +0000
commit095590e2247517cf22e4aea7956f341a9a38b206 (patch)
treeb56b7000d932f6b1d410c36a4d21d754d55453bd /components/layout_2020/flexbox/layout.rs
parent9346d9cc8d686d6bb7c96c427d4d7a0b1ac28142 (diff)
downloadservo-095590e2247517cf22e4aea7956f341a9a38b206.tar.gz
servo-095590e2247517cf22e4aea7956f341a9a38b206.zip
layout: Use `Au` in `ComputedValuesExt` (#33396)
* Use app unit in `ComputedValuesExt` Co-authored-by: Martin Robinson <mrobinson@igalia.com> Signed-off-by: atbrakhi <atbrakhi@igalia.com> * Some miscellaneous fixes Signed-off-by: Martin Robinson <mrobinson@igalia.com> * remove redundant defination of `containing_block_inline_size` Signed-off-by: atbrakhi <atbrakhi@igalia.com> --------- Signed-off-by: atbrakhi <atbrakhi@igalia.com> Signed-off-by: Martin Robinson <mrobinson@igalia.com> Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/layout_2020/flexbox/layout.rs')
-rw-r--r--components/layout_2020/flexbox/layout.rs14
1 files changed, 5 insertions, 9 deletions
diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs
index 49c110df443..af7d3ec583d 100644
--- a/components/layout_2020/flexbox/layout.rs
+++ b/components/layout_2020/flexbox/layout.rs
@@ -15,7 +15,6 @@ use style::properties::longhands::box_sizing::computed_value::T as BoxSizing;
use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap;
use style::properties::ComputedValues;
use style::values::computed::length::Size;
-use style::values::computed::Length;
use style::values::generics::flex::GenericFlexBasis as FlexBasis;
use style::values::generics::length::{GenericLengthPercentageOrAuto, LengthPercentageOrNormal};
use style::values::specified::align::AlignFlags;
@@ -938,15 +937,12 @@ impl FlexContainer {
let min_box_size = self
.style
.content_min_box_size(containing_block_for_container, &pbm)
- .auto_is(Length::zero);
+ .auto_is(Au::zero);
let max_box_size = self.config.flex_axis.vec2_to_flex_relative(max_box_size);
let min_box_size = self.config.flex_axis.vec2_to_flex_relative(min_box_size);
- (
- min_box_size.cross.into(),
- max_box_size.cross.map(Into::into),
- )
+ (min_box_size.cross, max_box_size.cross.map(Into::into))
}
}
@@ -1042,7 +1038,7 @@ impl<'a> FlexItem<'a> {
let item_with_auto_cross_size_stretches_to_container_size = flex_context
.config
- .item_with_auto_cross_size_stretches_to_container_size(&box_.style(), &margin);
+ .item_with_auto_cross_size_stretches_to_container_size(box_.style(), &margin);
let flex_relative_content_box_size = flex_context.vec2_to_flex_relative(content_box_size);
let flex_relative_content_max_size = flex_context.vec2_to_flex_relative(max_size);
@@ -2361,8 +2357,8 @@ impl FlexItemBox {
Some(container_definite_main_size) => {
let length = length_percentage
.0
- .percentage_relative_to(container_definite_main_size.into());
- FlexBasis::Size(apply_box_sizing(length.into()))
+ .to_used_value(container_definite_main_size);
+ FlexBasis::Size(apply_box_sizing(length))
},
None => {
if let Some(length) = length_percentage.0.to_length() {