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

Merge pull request #2713 from glennw/font-cleanup-2

Browse source 
Remove unused code path - simplifies other refactoring.
This commit is contained in:
Lars Bergstrom 2014-06-25 11:54:09 -05:00
commit dd1c833700
4 changed files with 1 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/gfx/font.rs
View file

@ -43,8 +43,6 @@ pub trait FontHandleMethods {
fn is_italic(&self) -> bool; fn is_italic(&self) -> bool;
fn boldness(&self) -> font_weight::T; fn boldness(&self) -> font_weight::T;
fn clone_with_style(&self, fctx: &FontContextHandle, style: &UsedFontStyle)
-> Result<FontHandle, ()>;
fn glyph_index(&self, codepoint: char) -> Option<GlyphId>; fn glyph_index(&self, codepoint: char) -> Option<GlyphId>;
fn glyph_h_advance(&self, GlyphId) -> Option<FractionalPixel>; fn glyph_h_advance(&self, GlyphId) -> Option<FractionalPixel>;
fn get_metrics(&self) -> FontMetrics; fn get_metrics(&self) -> FontMetrics;
@ -253,19 +251,6 @@ impl<'a> Font {
} }
} }
pub fn new_from_existing_handle(fctx: &FontContext, handle: &FontHandle,
style: &SpecifiedFontStyle, backend: BackendType)
-> Result<Rc<RefCell<Font>>,()> {
// TODO(Issue #179): convert between specified and used font style here?
let styled_handle = match handle.clone_with_style(&fctx.handle, style) {
Ok(result) => result,
Err(()) => return Err(())
};
return Ok(Rc::new(RefCell::new(Font::new_from_adopted_handle(fctx, styled_handle, style, backend))));
}
fn make_shaper(&'a mut self) -> &'a Shaper { fn make_shaper(&'a mut self) -> &'a Shaper {
// fast path: already created a shaper // fast path: already created a shaper
match self.shaper { match self.shaper {

13
src/components/gfx/platform/android/font.rs
View file

@ -160,19 +160,6 @@ impl FontHandleMethods for FontHandle {
} }
} }
fn clone_with_style(&self,
fctx: &FontContextHandle,
style: &UsedFontStyle) -> Result<FontHandle, ()> {
match self.source {
FontSourceMem(ref buf) => {
FontHandleMethods::new_from_buffer(fctx, buf.clone(), style)
}
FontSourceFile(ref file) => {
FontHandle::new_from_file(fctx, file.as_slice(), style)
}
}
}
fn glyph_index(&self, fn glyph_index(&self,
codepoint: char) -> Option<GlyphId> { codepoint: char) -> Option<GlyphId> {
assert!(self.face.is_not_null()); assert!(self.face.is_not_null());

15
src/components/gfx/platform/linux/font.rs
View file

@ -5,7 +5,7 @@
extern crate freetype; extern crate freetype;
use font::{FontHandleMethods, FontMetrics, FontTableMethods}; use font::{FontHandleMethods, FontMetrics, FontTableMethods};
use font::{FontTableTag, FractionalPixel, SpecifiedFontStyle, UsedFontStyle}; use font::{FontTableTag, FractionalPixel, SpecifiedFontStyle};
use servo_util::geometry::Au; use servo_util::geometry::Au;
use servo_util::geometry; use servo_util::geometry;
use platform::font_context::FontContextHandle; use platform::font_context::FontContextHandle;
@ -160,19 +160,6 @@ impl FontHandleMethods for FontHandle {
} }
} }
fn clone_with_style(&self,
fctx: &FontContextHandle,
style: &UsedFontStyle) -> Result<FontHandle, ()> {
match self.source {
FontSourceMem(ref buf) => {
FontHandleMethods::new_from_buffer(fctx, buf.clone(), style)
}
FontSourceFile(ref file) => {
FontHandle::new_from_file(fctx, file.as_slice(), style)
}
}
}
fn glyph_index(&self, fn glyph_index(&self,
codepoint: char) -> Option<GlyphId> { codepoint: char) -> Option<GlyphId> {
assert!(self.face.is_not_null()); assert!(self.face.is_not_null());

6
src/components/gfx/platform/macos/font.rs
View file

@ -119,12 +119,6 @@ impl FontHandleMethods for FontHandle {
return font_weight::Weight900; return font_weight::Weight900;
} }
fn clone_with_style(&self, fctx: &FontContextHandle, style: &SpecifiedFontStyle)
-> Result<FontHandle,()> {
let new_font = self.ctfont.clone_with_font_size(style.pt_size);
return FontHandle::new_from_CTFont(fctx, new_font);
}
fn glyph_index(&self, codepoint: char) -> Option<GlyphId> { fn glyph_index(&self, codepoint: char) -> Option<GlyphId> {
let characters: [UniChar, ..1] = [codepoint as UniChar]; let characters: [UniChar, ..1] = [codepoint as UniChar];
let glyphs: [CGGlyph, ..1] = [0 as CGGlyph]; let glyphs: [CGGlyph, ..1] = [0 as CGGlyph];