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

Add some trailing commas

Browse source
This commit is contained in:
Brendan Zabarauskas 2014-05-12 12:03:59 -07:00
parent 49df943649
commit 9df9f07cfd
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/components/gfx/text/glyph.rs
View file

@ -24,13 +24,13 @@ use geom::point::Point2D;
/// in DetailedGlyphStore. /// in DetailedGlyphStore.
#[deriving(Clone)] #[deriving(Clone)]
struct GlyphEntry { struct GlyphEntry {
value: u32 value: u32,
} }
impl GlyphEntry { impl GlyphEntry {
fn new(value: u32) -> GlyphEntry { fn new(value: u32) -> GlyphEntry {
GlyphEntry { GlyphEntry {
value: value value: value,
} }
} }
@ -91,7 +91,7 @@ pub type GlyphId = u32;
pub enum BreakType { pub enum BreakType {
BreakTypeNone, BreakTypeNone,
BreakTypeNormal, BreakTypeNormal,
BreakTypeHyphen BreakTypeHyphen,
} }
static BREAK_TYPE_NONE: u8 = 0x0; static BREAK_TYPE_NONE: u8 = 0x0;
@ -257,7 +257,7 @@ struct DetailedGlyph {
// glyph's advance, in the text's direction (RTL or RTL) // glyph's advance, in the text's direction (RTL or RTL)
advance: Au, advance: Au,
// glyph's offset from the font's em-box (from top-left) // glyph's offset from the font's em-box (from top-left)
offset: Point2D<Au> offset: Point2D<Au>,
} }
impl DetailedGlyph { impl DetailedGlyph {
@ -265,7 +265,7 @@ impl DetailedGlyph {
DetailedGlyph { DetailedGlyph {
id: id, id: id,
advance: advance, advance: advance,
offset: offset offset: offset,
} }
} }
} }
@ -275,7 +275,7 @@ struct DetailedGlyphRecord {
// source string offset/GlyphEntry offset in the TextRun // source string offset/GlyphEntry offset in the TextRun
entry_offset: int, entry_offset: int,
// offset into the detailed glyphs buffer // offset into the detailed glyphs buffer
detail_offset: int detail_offset: int,
} }
impl Ord for DetailedGlyphRecord { impl Ord for DetailedGlyphRecord {
@ -312,14 +312,14 @@ impl<'a> DetailedGlyphStore {
DetailedGlyphStore { DetailedGlyphStore {
detail_buffer: vec!(), // TODO: default size? detail_buffer: vec!(), // TODO: default size?
detail_lookup: vec!(), detail_lookup: vec!(),
lookup_is_sorted: false lookup_is_sorted: false,
} }
} }
fn add_detailed_glyphs_for_entry(&mut self, entry_offset: int, glyphs: &[DetailedGlyph]) { fn add_detailed_glyphs_for_entry(&mut self, entry_offset: int, glyphs: &[DetailedGlyph]) {
let entry = DetailedGlyphRecord { let entry = DetailedGlyphRecord {
entry_offset: entry_offset, entry_offset: entry_offset,
detail_offset: self.detail_buffer.len() as int detail_offset: self.detail_buffer.len() as int,
}; };
debug!("Adding entry[off={}] for detailed glyphs: {:?}", entry_offset, glyphs); debug!("Adding entry[off={}] for detailed glyphs: {:?}", entry_offset, glyphs);
@ -355,7 +355,7 @@ impl<'a> DetailedGlyphStore {
let key = DetailedGlyphRecord { let key = DetailedGlyphRecord {
entry_offset: entry_offset, entry_offset: entry_offset,
detail_offset: 0 // unused detail_offset: 0, // unused
}; };
// FIXME: This is a workaround for borrow of self.detail_lookup not getting inferred. // FIXME: This is a workaround for borrow of self.detail_lookup not getting inferred.
@ -379,7 +379,7 @@ impl<'a> DetailedGlyphStore {
let key = DetailedGlyphRecord { let key = DetailedGlyphRecord {
entry_offset: entry_offset, entry_offset: entry_offset,
detail_offset: 0 // unused detail_offset: 0, // unused
}; };
// FIXME: This is a workaround for borrow of self.detail_lookup not getting inferred. // FIXME: This is a workaround for borrow of self.detail_lookup not getting inferred.
@ -441,7 +441,7 @@ impl GlyphData {
-> GlyphData { -> GlyphData {
let offset = match offset { let offset = match offset {
None => Zero::zero(), None => Zero::zero(),
Some(o) => o Some(o) => o,
}; };
GlyphData { GlyphData {
@ -461,7 +461,7 @@ impl GlyphData {
// values as they are needed from the GlyphStore, using provided offsets. // values as they are needed from the GlyphStore, using provided offsets.
pub enum GlyphInfo<'a> { pub enum GlyphInfo<'a> {
SimpleGlyphInfo(&'a GlyphStore, int), SimpleGlyphInfo(&'a GlyphStore, int),
DetailGlyphInfo(&'a GlyphStore, int, u16) DetailGlyphInfo(&'a GlyphStore, int, u16),
} }
impl<'a> GlyphInfo<'a> { impl<'a> GlyphInfo<'a> {
@ -610,7 +610,7 @@ impl<'a> GlyphStore {
store: self, store: self,
char_index: rang.begin(), char_index: rang.begin(),
char_range: rang.each_index(), char_range: rang.each_index(),
glyph_range: None glyph_range: None,
} }
} }