Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-18 05:14:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix ch/em confusion.

Browse source
This commit is contained in:
Simon Sapin 2015-09-02 10:14:00 +02:00
parent 9f48dcd858
commit b51b7dd2ce
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/values.rs
View file

@ -631,7 +631,7 @@ pub mod specified {
vmin: vmin.map(ViewportPercentageLength::Vmin), vmin: vmin.map(ViewportPercentageLength::Vmin),
em: em.map(FontRelativeLength::Em), em: em.map(FontRelativeLength::Em),
ex: ex.map(FontRelativeLength::Ex), ex: ex.map(FontRelativeLength::Ex),
ch: ex.map(FontRelativeLength::Ch), ch: ch.map(FontRelativeLength::Ch),
rem: rem.map(FontRelativeLength::Rem), rem: rem.map(FontRelativeLength::Rem),
percentage: percentage.map(Percentage), percentage: percentage.map(Percentage),
}) })
@ -673,14 +673,14 @@ pub mod specified {
}; };
} }
let count = count!(em, ex, ch, absolute, rem, vh, vmax, vmin, vw, percentage); let count = count!(ch, em, ex, absolute, rem, vh, vmax, vmin, vw, percentage);
assert!(count > 0); assert!(count > 0);
if count > 1 { if count > 1 {
try!(write!(dest, "calc(")); try!(write!(dest, "calc("));
} }
serialize!(em, ex, ch, absolute, rem, vh, vmax, vmin, vw, percentage); serialize!(ch, em, ex, absolute, rem, vh, vmax, vmin, vw, percentage);
if count > 1 { if count > 1 {
try!(write!(dest, ")")); try!(write!(dest, ")"));
@ -1334,7 +1334,7 @@ pub mod computed {
val.to_computed_value(context.viewport_size)); val.to_computed_value(context.viewport_size));
} }
} }
for val in &[self.em, self.ex, self.ch, self.rem] { for val in &[self.ch, self.em, self.ex, self.rem] {
if let Some(val) = *val { if let Some(val) = *val {
length = Some(length.unwrap_or(Au(0)) + length = Some(length.unwrap_or(Au(0)) +
val.to_computed_value(context.font_size, context.root_font_size)); val.to_computed_value(context.font_size, context.root_font_size));