Auto merge of #16853 - upsuper:font-feature-settings-serialization, r=emilio

Fix serialization of font-feature-settings

<!-- 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/16853)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-13 23:56:25 -05:00 committed by GitHub
commit dab2df3565

View file

@ -1839,15 +1839,16 @@ ${helpers.single_keyword_system("font-variant-position",
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
use std::str; use std::str;
use byteorder::{WriteBytesExt, BigEndian}; use byteorder::{WriteBytesExt, BigEndian};
use cssparser::serialize_string;
let mut raw: Vec<u8> = vec!(); let mut raw: Vec<u8> = vec!();
raw.write_u32::<BigEndian>(self.tag).unwrap(); raw.write_u32::<BigEndian>(self.tag).unwrap();
let str_print = str::from_utf8(&raw).unwrap_or_default(); serialize_string(str::from_utf8(&raw).unwrap_or_default(), dest)?;
match self.value { match self.value {
1 => write!(dest, "\"{}\"", str_print), 1 => Ok(()),
0 => write!(dest, "\"{}\" off",str_print), 0 => dest.write_str(" off"),
x => write!(dest, "\"{}\" {}", str_print, x) x => write!(dest, " {}", x)
} }
} }
} }