Skip to content
Permalink
Browse files

Revert unnecessary code change

  • Loading branch information...
deokjinkim committed Oct 4, 2013
1 parent 5d59c00 commit 6aa9104907721d9541ed3a3291945f45f14e85dc
@@ -49,7 +49,7 @@ pub trait FontHandleMethods {
fn clone_with_style(&self, fctx: &FontContextHandle, style: &UsedFontStyle)
-> Result<FontHandle, ()>;
fn glyph_index(&self, codepoint: char) -> Option<GlyphIndex>;
fn glyph_h_advance(&mut self, GlyphIndex) -> Option<FractionalPixel>;
fn glyph_h_advance(&self, GlyphIndex) -> Option<FractionalPixel>;
fn get_metrics(&self) -> FontMetrics;
fn get_table_for_tag(&self, FontTableTag) -> Option<FontTable>;
}
@@ -198,7 +198,7 @@ impl FontHandleMethods for FontHandle {
}

#[fixed_stack_segment]
fn glyph_h_advance(&mut self,
fn glyph_h_advance(&self,
glyph: GlyphIndex) -> Option<FractionalPixel> {
assert!(self.face.is_not_null());
unsafe {
@@ -198,7 +198,7 @@ impl FontHandleMethods for FontHandle {
}

#[fixed_stack_segment]
fn glyph_h_advance(&mut self,
fn glyph_h_advance(&self,
glyph: GlyphIndex) -> Option<FractionalPixel> {
assert!(self.face.is_not_null());
unsafe {
@@ -147,7 +147,7 @@ impl FontHandleMethods for FontHandle {
return Some(glyphs[0] as GlyphIndex);
}

fn glyph_h_advance(&mut self, glyph: GlyphIndex) -> Option<FractionalPixel> {
fn glyph_h_advance(&self, glyph: GlyphIndex) -> Option<FractionalPixel> {
let glyphs = [glyph as CGGlyph];
let advance = self.ctfont.get_advances_for_glyphs(kCTFontDefaultOrientation,
&glyphs[0],

5 comments on commit 6aa9104

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 7, 2013

saw approval from ILyoan
at deokjinkim@6aa9104

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 7, 2013

merging deokjinkim/servo/glyph_advance_cache = 6aa9104 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 7, 2013

deokjinkim/servo/glyph_advance_cache = 6aa9104 merged ok, testing candidate = d99e69e

@bors-servo

This comment has been minimized.

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 7, 2013

fast-forwarding master to auto = d99e69e

Please sign in to comment.
You can’t perform that action at this time.