Auto merge of #15917 - emilio:moz-fixes, r=Manishearth

Simplify some -moz-fixed handling code.

This was introduced in #15916, but most of it is actually unreachable.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15917)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-11 15:01:13 -08:00 committed by GitHub
commit 430c7d924d

View file

@ -57,9 +57,6 @@
atom!("sans-serif") |
atom!("cursive") |
atom!("fantasy") |
% if product == "gecko":
atom!("-moz-fixed") |
% endif
atom!("monospace") => {
return FontFamily::Generic(input)
}
@ -70,9 +67,6 @@
"sans-serif" => return FontFamily::Generic(atom!("sans-serif")),
"cursive" => return FontFamily::Generic(atom!("cursive")),
"fantasy" => return FontFamily::Generic(atom!("fantasy")),
% if product == "gecko":
"-moz-fixed" => return FontFamily::Generic(atom!("-moz-fixed")),
% endif
"monospace" => return FontFamily::Generic(atom!("monospace")),
_ => {}
}
@ -150,10 +144,9 @@
if name == &atom!("-moz-fixed") {
return write!(dest, "monospace");
}
write!(dest, "{}", name)
% else:
write!(dest, "{}", name)
% endif
write!(dest, "{}", name)
},
}
}