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

Simplify add_glyph_for_char_index

Browse source
This commit is contained in:
Matt Brubeck 2015-09-30 09:36:01 -07:00
parent 61be58a87f
commit e663005ce2
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/gfx/text/glyph.rs
View file

@ -465,19 +465,17 @@ impl<'a> GlyphStore {
/// otherwise, this glyph represents multiple characters. /// otherwise, this glyph represents multiple characters.
pub fn add_glyph_for_char_index(&mut self, pub fn add_glyph_for_char_index(&mut self,
i: CharIndex, i: CharIndex,
character: Option<char>, character: char,
data: &GlyphData) { data: &GlyphData) {
fn glyph_is_compressible(data: &GlyphData) -> bool { let glyph_is_compressible = is_simple_glyph_id(data.id) &&
is_simple_glyph_id(data.id) is_simple_advance(data.advance)
&& is_simple_advance(data.advance)
&& data.offset == Point2D::zero() && data.offset == Point2D::zero()
&& data.cluster_start // others are stored in detail buffer && data.cluster_start; // others are stored in detail buffer
}
debug_assert!(data.ligature_start); // can't compress ligature continuation glyphs. debug_assert!(data.ligature_start); // can't compress ligature continuation glyphs.
debug_assert!(i < self.char_len()); debug_assert!(i < self.char_len());
let mut entry = match (data.is_missing, glyph_is_compressible(data)) { let mut entry = match (data.is_missing, glyph_is_compressible) {
(true, _) => GlyphEntry::missing(1), (true, _) => GlyphEntry::missing(1),
(false, true) => GlyphEntry::simple(data.id, data.advance), (false, true) => GlyphEntry::simple(data.id, data.advance),
(false, false) => { (false, false) => {
@ -488,7 +486,7 @@ impl<'a> GlyphStore {
} }
}; };
if character == Some(' ') { if character == ' ' {
entry = entry.set_char_is_space() entry = entry.set_char_is_space()
} }

4
components/gfx/text/shaping/harfbuzz.rs
View file

@ -456,7 +456,7 @@ impl Shaper {
false, false,
true, true,
true); true);
glyphs.add_glyph_for_char_index(char_idx, Some(character), &data); glyphs.add_glyph_for_char_index(char_idx, character, &data);
} else { } else {
let shape = glyph_data.entry_for_glyph(glyph_span.begin(), &mut y_pos); let shape = glyph_data.entry_for_glyph(glyph_span.begin(), &mut y_pos);
let advance = self.advance_for_shaped_glyph(shape.advance, character, options); let advance = self.advance_for_shaped_glyph(shape.advance, character, options);
@ -466,7 +466,7 @@ impl Shaper {
false, false,
true, true,
true); true);
glyphs.add_glyph_for_char_index(char_idx, Some(character), &data); glyphs.add_glyph_for_char_index(char_idx, character, &data);
} }
} else { } else {
// collect all glyphs to be assigned to the first character. // collect all glyphs to be assigned to the first character.