From 11af5ffda6c17a6ed1bc95822ad1e17126255235 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Thu, 18 Jul 2013 20:11:35 -0600 Subject: [PATCH] Rename variables for clarity. --- src/components/main/layout/box.rs | 39 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/components/main/layout/box.rs b/src/components/main/layout/box.rs index eddca30c436..1839d93dfc0 100644 --- a/src/components/main/layout/box.rs +++ b/src/components/main/layout/box.rs @@ -390,25 +390,28 @@ impl RenderBox { } else { let style = self.style(); let font_size = style.font_size(); - let w = MaybeAuto::from_width(style.width(), - Au(0), - font_size).specified_or_zero(); - let ml = MaybeAuto::from_margin(style.margin_left(), - Au(0), - font_size).specified_or_zero(); - let mr = MaybeAuto::from_margin(style.margin_right(), - Au(0), - font_size).specified_or_zero(); - let pl = base.model.compute_padding_length(style.padding_left(), - Au(0), - font_size); - let pr = base.model.compute_padding_length(style.padding_right(), - Au(0), - font_size); - let bl = base.model.compute_border_width(style.border_left_width(), font_size); - let br = base.model.compute_border_width(style.border_right_width(), font_size); + let width = MaybeAuto::from_width(style.width(), + Au(0), + font_size).specified_or_zero(); + let margin_left = MaybeAuto::from_margin(style.margin_left(), + Au(0), + font_size).specified_or_zero(); + let margin_right = MaybeAuto::from_margin(style.margin_right(), + Au(0), + font_size).specified_or_zero(); + let padding_left = base.model.compute_padding_length(style.padding_left(), + Au(0), + font_size); + let padding_right = base.model.compute_padding_length(style.padding_right(), + Au(0), + font_size); + let border_left = base.model.compute_border_width(style.border_left_width(), + font_size); + let border_right = base.model.compute_border_width(style.border_right_width(), + font_size); - w + ml + mr + pl + pr + bl + br + width + margin_left + margin_right + padding_left + padding_right + + border_left + border_right } } }