Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Minimal refactor in style_specified_intrinsic_inline_size to improve legibility.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-04-13 04:45:41 +02:00
parent 3d4aa46bcf
commit 7712affd2c
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/layout/fragment.rs
View file

@ -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();