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

Fix CalcLengthOrPercentage serialization

Browse source
This commit is contained in:
Nazım Can Altınova 2017-01-24 19:33:15 +03:00
parent 2a32cf1352
commit 29ac1714c4
2 changed files with 17 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

27
components/style/values/specified/length.rs
View file

@ -761,20 +761,6 @@ impl HasViewportPercentage for CalcLengthOrPercentage {
impl ToCss for CalcLengthOrPercentage {
#[allow(unused_assignments)]
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
macro_rules! count {
( $( $val:ident ),* ) => {
{
let mut count = 0;
$(
if let Some(_) = self.$val {
count += 1;
}
)*
count
}
};
}
let mut first_value = true;
macro_rules! first_value_check {
() => {
@ -798,12 +784,7 @@ impl ToCss for CalcLengthOrPercentage {
};
}
let count = count!(ch, em, ex, absolute, rem, vh, vmax, vmin, vw, percentage);
assert!(count > 0);
if count > 1 {
try!(write!(dest, "calc("));
}
try!(write!(dest, "calc("));
serialize!(ch, em, ex, rem, vh, vmax, vmin, vw);
if let Some(val) = self.absolute {
@ -816,11 +797,7 @@ impl ToCss for CalcLengthOrPercentage {
try!(write!(dest, "{}%", val * 100.));
}
if count > 1 {
try!(write!(dest, ")"));
}
Ok(())
write!(dest, ")")
}
}