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

Upgrade to rustc 1.43.0-nightly (5d04ce67f 2020-02-13)

Browse source
This commit is contained in:
Simon Sapin 2020-02-14 10:58:04 +01:00
parent db4f27f361
commit 708d3737df
9 changed files with 53 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/fragment.rs
View file

@ -944,8 +944,8 @@ impl Fragment {
QuantitiesIncludedInIntrinsicInlineSizes::INTRINSIC_INLINE_SIZE_INCLUDES_MARGINS,
) {
let margin = style.logical_margin();
(MaybeAuto::from_style(margin.inline_start, Au(0)).specified_or_zero() +
MaybeAuto::from_style(margin.inline_end, Au(0)).specified_or_zero())
MaybeAuto::from_style(margin.inline_start, Au(0)).specified_or_zero() +
MaybeAuto::from_style(margin.inline_end, Au(0)).specified_or_zero()
} else {
Au(0)
};
@ -957,7 +957,7 @@ impl Fragment {
QuantitiesIncludedInIntrinsicInlineSizes::INTRINSIC_INLINE_SIZE_INCLUDES_PADDING,
) {
let padding = style.logical_padding();
(padding.inline_start.to_used_value(Au(0)) + padding.inline_end.to_used_value(Au(0)))
padding.inline_start.to_used_value(Au(0)) + padding.inline_end.to_used_value(Au(0))
} else {
Au(0)
};