diff options
Diffstat (limited to 'components/layout_2020/flexbox')
| -rw-r--r-- | components/layout_2020/flexbox/geom.rs | 10 | ||||
| -rw-r--r-- | components/layout_2020/flexbox/layout.rs | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/components/layout_2020/flexbox/geom.rs b/components/layout_2020/flexbox/geom.rs index ec8f1e3346e..d99682729ed 100644 --- a/components/layout_2020/flexbox/geom.rs +++ b/components/layout_2020/flexbox/geom.rs @@ -63,16 +63,6 @@ impl<T> FlexRelativeSides<T> { cross: self.cross_start + self.cross_end, } } - - // TODO(#29819): Check if this function can be removed after we convert everything to Au. - pub fn map<U>(&self, f: impl Fn(&T) -> U) -> FlexRelativeSides<U> { - FlexRelativeSides { - main_start: f(&self.main_start), - main_end: f(&self.main_end), - cross_start: f(&self.cross_start), - cross_end: f(&self.cross_end), - } - } } /// One of the two bits set by the `flex-direction` property diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs index 804dc7b2108..77c1111bb46 100644 --- a/components/layout_2020/flexbox/layout.rs +++ b/components/layout_2020/flexbox/layout.rs @@ -856,9 +856,9 @@ impl FlexLine<'_> { item.box_.style().clone(), item_result.fragments, content_rect, - flex_context.sides_to_flow_relative(item.padding.map(|t| (*t).into())), - flex_context.sides_to_flow_relative(item.border.map(|t| (*t).into())), - margin, + flex_context.sides_to_flow_relative(item.padding), + flex_context.sides_to_flow_relative(item.border), + margin.into(), None, /* clearance */ collapsed_margin, ), |