Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Brace multi-line match patterns per coding style.

Browse source
This commit is contained in:
Jack Moffitt 2013-07-18 20:05:32 -06:00
parent 4d1e21bd8e
commit b2c042df94
1 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/components/main/layout/model.rs
View file

@ -37,15 +37,15 @@ impl MaybeAuto {
CSSMarginPercentage(percent) => Specified(cb_width.scale_by(percent/100.0)),
CSSMarginLength(Px(v)) => Specified(Au::from_frac_px(v)),
CSSMarginLength(Pt(v)) => Specified(Au::from_pt(v)),
CSSMarginLength(Em(em)) => match font_size {
CSSFontSizeLength(Px(v)) =>
Specified(Au::from_frac_px(em * v)),
CSSFontSizeLength(Pt(v)) =>
Specified(Au::from_pt(em * v)),
CSSMarginLength(Em(em)) => {
match font_size {
CSSFontSizeLength(Px(v)) => Specified(Au::from_frac_px(em * v)),
CSSFontSizeLength(Pt(v)) => Specified(Au::from_pt(em * v)),
_ => fail!(~"expected non-relative font size"),
}
}
}
}
pub fn from_width(width: CSSWidth, cb_width: Au, font_size: CSSFontSize) -> MaybeAuto {
match width {
@ -53,15 +53,15 @@ impl MaybeAuto {
CSSWidthPercentage(percent) => Specified(cb_width.scale_by(percent/100.0)),
CSSWidthLength(Px(v)) => Specified(Au::from_frac_px(v)),
CSSWidthLength(Pt(v)) => Specified(Au::from_pt(v)),
CSSWidthLength(Em(em)) => match font_size {
CSSFontSizeLength(Px(v)) =>
Specified(Au::from_frac_px(em * v)),
CSSFontSizeLength(Pt(v)) =>
Specified(Au::from_pt(em * v)),
CSSWidthLength(Em(em)) => {
match font_size {
CSSFontSizeLength(Px(v)) => Specified(Au::from_frac_px(em * v)),
CSSFontSizeLength(Pt(v)) => Specified(Au::from_pt(em * v)),
_ => fail!(~"expected non-relative font size"),
}
}
}
}
pub fn from_height(height: CSSHeight, cb_height: Au, font_size: CSSFontSize) -> MaybeAuto {
match height {
@ -69,13 +69,13 @@ impl MaybeAuto {
CSSHeightPercentage(percent) => Specified(cb_height.scale_by(percent/100.0)),
CSSHeightLength(Px(v)) => Specified(Au::from_frac_px(v)),
CSSHeightLength(Pt(v)) => Specified(Au::from_pt(v)),
CSSHeightLength(Em(em)) => match font_size {
CSSFontSizeLength(Px(v)) =>
Specified(Au::from_frac_px(em * v)),
CSSFontSizeLength(Pt(v)) =>
Specified(Au::from_pt(em * v)),
CSSHeightLength(Em(em)) => {
match font_size {
CSSFontSizeLength(Px(v)) => Specified(Au::from_frac_px(em * v)),
CSSFontSizeLength(Pt(v)) => Specified(Au::from_pt(em * v)),
_ => fail!(~"expected non-relative font size"),
}
}
}
}
@ -139,10 +139,12 @@ impl BoxModel {
match width {
CSSBorderWidthLength(Px(v)) => Au::from_frac_px(v),
CSSBorderWidthLength(Pt(v)) => Au::from_pt(v),
CSSBorderWidthLength(Em(em)) => match font_size {
CSSBorderWidthLength(Em(em)) => {
match font_size {
CSSFontSizeLength(Px(v)) => Au::from_frac_px(em * v),
CSSFontSizeLength(Pt(v)) => Au::from_pt(em * v),
_ => fail!(~"expected non-relative font size"),
}
},
CSSBorderWidthThin => Au::from_px(1),
CSSBorderWidthMedium => Au::from_px(5),
@ -154,10 +156,12 @@ impl BoxModel {
match padding {
CSSPaddingLength(Px(v)) => Au::from_frac_px(v),
CSSPaddingLength(Pt(v)) => Au::from_pt(v),
CSSPaddingLength(Em(em)) => match font_size {
CSSPaddingLength(Em(em)) => {
match font_size {
CSSFontSizeLength(Px(v)) => Au::from_frac_px(em * v),
CSSFontSizeLength(Pt(v)) => Au::from_pt(em * v),
_ => fail!(~"expected non-relative font size"),
}
},
CSSPaddingPercentage(p) => content_box_width.scale_by(p/100.0)
}