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

Auto merge of #7799 - mbrubeck:glyph-cleanup, r=pcwalton

Browse source 
Misc. code cleanup in gfx::text::glyph.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7799)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-09-30 17:44:02 -06:00
commit ac448cacba
3 changed files with 36 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -453,20 +453,18 @@ impl Shaper {
let data = GlyphData::new(space_glyph_id,
advance,
Default::default(),
false,
true,
true);
glyphs.add_glyph_for_char_index(char_idx, Some(character), &data);
glyphs.add_glyph_for_char_index(char_idx, character, &data);
} else {
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 data = GlyphData::new(shape.codepoint,
advance,
shape.offset,
false,
true,
true);
glyphs.add_glyph_for_char_index(char_idx, Some(character), &data);
glyphs.add_glyph_for_char_index(char_idx, character, &data);
}
} else {
// collect all glyphs to be assigned to the first character.
@ -477,7 +475,6 @@ impl Shaper {
datas.push(GlyphData::new(shape.codepoint,
shape.advance,
shape.offset,
false, // not missing
true, // treat as cluster start
glyph_i > glyph_span.begin()));
// all but first are ligature continuations