From 6763e7e4aea076015e30223fb35731fd7826c0a2 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 4 Dec 2019 14:18:25 +0100
Subject: [PATCH] Review nits

---
 components/layout_2020/flow/construct.rs |  3 +--
 components/layout_2020/flow/inline.rs    | 11 +++++------
 components/layout_2020/positioned.rs     |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/components/layout_2020/flow/construct.rs b/components/layout_2020/flow/construct.rs
index 80f44b2ff81..5d9cd433434 100644
--- a/components/layout_2020/flow/construct.rs
+++ b/components/layout_2020/flow/construct.rs
@@ -189,14 +189,13 @@ impl BlockContainer {
             contains_floats: builder.contains_floats,
             outer_content_sizes_of_children: ContentSizes::zero(),
         };
-        let request_childrens_outer_content_sizes = request_content_sizes;
         let iter = builder.block_level_boxes.into_par_iter();
         let iter = iter.mapfold_reduce_into(
             &mut target,
             |target, (intermediate, box_slot): (Intermediate<_>, BoxSlot<'_>)| {
                 let (block_level_box, box_contains_floats) = intermediate.finish(
                     context,
-                    if request_childrens_outer_content_sizes {
+                    if request_content_sizes {
                         Some(&mut target.outer_content_sizes_of_children)
                     } else {
                         None
diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs
index 5fb01c0fa53..fe66d486e9a 100644
--- a/components/layout_2020/flow/inline.rs
+++ b/components/layout_2020/flow/inline.rs
@@ -406,9 +406,10 @@ fn layout_atomic<'box_tree>(
         .margin()
         .percentages_relative_to(cbis)
         .auto_is(Length::zero);
-    ifc.inline_position += padding.inline_start + border.inline_start + margin.inline_start;
+    let pbm = &(&padding + &border) + &margin;
+    ifc.inline_position += pbm.inline_start;
     let mut start_corner = Vec2 {
-        block: padding.block_start + border.block_start + margin.block_start,
+        block: pbm.block_start,
         inline: ifc.inline_position - ifc.current_nesting_level.inline_start,
     };
     start_corner += &relative_adjustement(
@@ -437,8 +438,7 @@ fn layout_atomic<'box_tree>(
         Err(non_replaced) => {
             let box_size = atomic.style.box_size();
             let inline_size = box_size.inline.percentage_relative_to(cbis).auto_is(|| {
-                let available_size =
-                    cbis - padding.inline_sum() - border.inline_sum() - margin.inline_sum();
+                let available_size = cbis - pbm.inline_sum();
                 shrink_to_fit(&atomic.inline_content_sizes, available_size)
             });
             let block_size = box_size
@@ -482,8 +482,7 @@ fn layout_atomic<'box_tree>(
         },
     };
 
-    ifc.inline_position +=
-        fragment.padding.inline_end + fragment.border.inline_end + fragment.margin.inline_end;
+    ifc.inline_position += pbm.inline_end;
     ifc.current_nesting_level
         .fragments_so_far
         .push(Fragment::Box(fragment));
diff --git a/components/layout_2020/positioned.rs b/components/layout_2020/positioned.rs
index 7d61916b2c1..b99b6b8293f 100644
--- a/components/layout_2020/positioned.rs
+++ b/components/layout_2020/positioned.rs
@@ -307,7 +307,7 @@ impl<'a> AbsolutelyPositionedFragment<'a> {
             Ok(replaced) => {
                 // FIXME: implement https://drafts.csswg.org/css2/visudet.html#abs-replaced-width
                 // and https://drafts.csswg.org/css2/visudet.html#abs-replaced-height
-                let block_size = block_size.auto_is(|| Length::zero());
+                let block_size = block_size.auto_is(Length::zero);
                 let fragments = replaced.make_fragments(
                     &self.absolutely_positioned_box.contents.style,
                     Vec2 {