aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <me@emiliocobos.me>2016-04-13 04:45:41 +0200
committerEmilio Cobos Álvarez <me@emiliocobos.me>2016-04-13 05:44:40 +0200
commit7712affd2c4c8b06c3b0df2b48bd448acd0e251b (patch)
treeeaae04b7b98016d15953d8cebf8558439a790dcc
parent3d4aa46bcf4cecde2b5fa239b0ace5c6280b43b5 (diff)
downloadservo-7712affd2c4c8b06c3b0df2b48bd448acd0e251b.tar.gz
servo-7712affd2c4c8b06c3b0df2b48bd448acd0e251b.zip
layout: Minimal refactor in style_specified_intrinsic_inline_size to improve legibility.
-rw-r--r--components/layout/fragment.rs16
1 files changed, 7 insertions, 9 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 1b02054e5c3..03638be5fab 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -1029,17 +1029,15 @@ impl Fragment {
fn style_specified_intrinsic_inline_size(&self) -> IntrinsicISizesContribution {
let flags = self.quantities_included_in_intrinsic_inline_size();
let style = self.style();
- let specified = if flags.contains(INTRINSIC_INLINE_SIZE_INCLUDES_SPECIFIED) {
- let specified = MaybeAuto::from_style(style.content_inline_size(), Au(0)).specified_or_zero();
- let min_or_specified = max(model::specified(style.min_inline_size(), Au(0)), specified);
+ let mut specified = Au(0);
+
+ if flags.contains(INTRINSIC_INLINE_SIZE_INCLUDES_SPECIFIED) {
+ specified = MaybeAuto::from_style(style.content_inline_size(), Au(0)).specified_or_zero();
+ specified = max(model::specified(style.min_inline_size(), Au(0)), specified);
if let Some(max) = model::specified_or_none(style.max_inline_size(), Au(0)) {
- min(min_or_specified, max)
- } else {
- min_or_specified
+ specified = min(specified, max)
}
- } else {
- Au(0)
- };
+ }
// FIXME(#2261, pcwalton): This won't work well for inlines: is this OK?
let surrounding_inline_size = self.surrounding_intrinsic_inline_size();