Skip to content

Commit

Permalink
Revert unnecessary code change
Browse files Browse the repository at this point in the history
  • Loading branch information
deokjinkim committed Oct 4, 2013
1 parent 5d59c00 commit 6aa9104
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/components/gfx/font.rs
Expand Up @@ -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>;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/gfx/platform/android/font.rs
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/gfx/platform/linux/font.rs
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/gfx/platform/macos/font.rs
Expand Up @@ -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],
Expand Down

5 comments on commit 6aa9104

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from ILyoan
at deokjinkim@6aa9104

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging deokjinkim/servo/glyph_advance_cache = 6aa9104 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = d99e69e

Please sign in to comment.