auto merge of #5472 : jdm/servo/advance, r=jdm

Rebased from #5035.
This commit is contained in:
bors-servo 2015-04-01 16:45:40 -06:00
commit e65e881e1b
4 changed files with 10 additions and 2 deletions

View file

@ -156,8 +156,11 @@ fn is_simple_glyph_id(id: GlyphId) -> bool {
}
fn is_simple_advance(advance: Au) -> bool {
let unsigned_au = advance.to_u32().unwrap();
(unsigned_au & (GLYPH_ADVANCE_MASK >> GLYPH_ADVANCE_SHIFT as uint)) == unsigned_au
match advance.to_u32() {
Some(unsigned_au) =>
(unsigned_au & (GLYPH_ADVANCE_MASK >> GLYPH_ADVANCE_SHIFT as uint)) == unsigned_au,
None => false
}
}
type DetailedGlyphCount = u16;