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

Convert internal font code to store pt size as Au.

Browse source
This commit is contained in:
Glenn Watson 2014-10-22 13:44:59 +10:00
parent cf789e40c5
commit 8331cfe089
6 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/gfx/font.rs
View file

@ -28,7 +28,7 @@ use platform::font_template::FontTemplateData;
// resources needed by the graphics layer to draw glyphs. // resources needed by the graphics layer to draw glyphs.
pub trait FontHandleMethods { pub trait FontHandleMethods {
fn new_from_template(fctx: &FontContextHandle, template: Arc<FontTemplateData>, pt_size: Option<f64>) fn new_from_template(fctx: &FontContextHandle, template: Arc<FontTemplateData>, pt_size: Option<Au>)
-> Result<Self,()>; -> Result<Self,()>;
fn get_template(&self) -> Arc<FontTemplateData>; fn get_template(&self) -> Arc<FontTemplateData>;
fn family_name(&self) -> String; fn family_name(&self) -> String;
@ -92,8 +92,8 @@ pub struct Font {
pub metrics: FontMetrics, pub metrics: FontMetrics,
pub variant: font_variant::T, pub variant: font_variant::T,
pub descriptor: FontTemplateDescriptor, pub descriptor: FontTemplateDescriptor,
pub requested_pt_size: f64, pub requested_pt_size: Au,
pub actual_pt_size: f64, pub actual_pt_size: Au,
pub shaper: Option<Shaper>, pub shaper: Option<Shaper>,
pub shape_cache: HashCache<String, Arc<GlyphStore>>, pub shape_cache: HashCache<String, Arc<GlyphStore>>,
pub glyph_advance_cache: HashCache<u32, FractionalPixel>, pub glyph_advance_cache: HashCache<u32, FractionalPixel>,

25
components/gfx/font_context.rs
View file

@ -14,6 +14,7 @@ use font::FontHandleMethods;
use platform::font::FontHandle; use platform::font::FontHandle;
use servo_util::cache::HashCache; use servo_util::cache::HashCache;
use servo_util::smallvec::{SmallVec, SmallVec1}; use servo_util::smallvec::{SmallVec, SmallVec1};
use servo_util::geometry::Au;
use std::rc::Rc; use std::rc::Rc;
use std::cell::RefCell; use std::cell::RefCell;
@ -29,14 +30,14 @@ use azure::scaled_font::FontData;
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
#[cfg(target_os="android")] #[cfg(target_os="android")]
fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: f64) -> ScaledFont { fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: Au) -> ScaledFont {
ScaledFont::new(SkiaBackend, FontData(&template.bytes), pt_size as AzFloat) ScaledFont::new(SkiaBackend, FontData(&template.bytes), pt_size.to_subpx() as AzFloat)
} }
#[cfg(target_os="macos")] #[cfg(target_os="macos")]
fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: f64) -> ScaledFont { fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: Au) -> ScaledFont {
let cgfont = template.ctfont.as_ref().unwrap().copy_to_CGFont(); let cgfont = template.ctfont.as_ref().unwrap().copy_to_CGFont();
ScaledFont::new(SkiaBackend, &cgfont, pt_size as AzFloat) ScaledFont::new(SkiaBackend, &cgfont, pt_size.to_subpx() as AzFloat)
} }
static SMALL_CAPS_SCALE_FACTOR: f64 = 0.8; // Matches FireFox (see gfxFont.h) static SMALL_CAPS_SCALE_FACTOR: f64 = 0.8; // Matches FireFox (see gfxFont.h)
@ -53,7 +54,7 @@ struct FallbackFontCacheEntry {
/// A cached azure font (per render task) that /// A cached azure font (per render task) that
/// can be shared by multiple text runs. /// can be shared by multiple text runs.
struct RenderFontCacheEntry { struct RenderFontCacheEntry {
pt_size: f64, pt_size: Au,
identifier: String, identifier: String,
font: Rc<RefCell<ScaledFont>>, font: Rc<RefCell<ScaledFont>>,
} }
@ -89,13 +90,13 @@ impl FontContext {
/// Create a font for use in layout calculations. /// Create a font for use in layout calculations.
fn create_layout_font(&self, template: Arc<FontTemplateData>, fn create_layout_font(&self, template: Arc<FontTemplateData>,
descriptor: FontTemplateDescriptor, pt_size: f64, descriptor: FontTemplateDescriptor, pt_size: Au,
variant: font_variant::T) -> Font { variant: font_variant::T) -> Font {
// TODO: (Bug #3463): Currently we only support fake small-caps // TODO: (Bug #3463): Currently we only support fake small-caps
// rendering. We should also support true small-caps (where the // rendering. We should also support true small-caps (where the
// font supports it) in the future. // font supports it) in the future.
let actual_pt_size = match variant { let actual_pt_size = match variant {
font_variant::small_caps => pt_size * SMALL_CAPS_SCALE_FACTOR, font_variant::small_caps => pt_size.scale_by(SMALL_CAPS_SCALE_FACTOR),
font_variant::normal => pt_size, font_variant::normal => pt_size,
}; };
@ -140,7 +141,7 @@ impl FontContext {
Some(ref cached_font_ref) => { Some(ref cached_font_ref) => {
let cached_font = cached_font_ref.borrow(); let cached_font = cached_font_ref.borrow();
if cached_font.descriptor == desc && if cached_font.descriptor == desc &&
cached_font.requested_pt_size == style.font_size.to_subpx() && cached_font.requested_pt_size == style.font_size &&
cached_font.variant == style.font_variant { cached_font.variant == style.font_variant {
fonts.push((*cached_font_ref).clone()); fonts.push((*cached_font_ref).clone());
cache_hit = true; cache_hit = true;
@ -159,7 +160,7 @@ impl FontContext {
Some(font_template) => { Some(font_template) => {
let layout_font = self.create_layout_font(font_template, let layout_font = self.create_layout_font(font_template,
desc.clone(), desc.clone(),
style.font_size.to_subpx(), style.font_size,
style.font_variant); style.font_variant);
let layout_font = Rc::new(RefCell::new(layout_font)); let layout_font = Rc::new(RefCell::new(layout_font));
self.layout_font_cache.push(LayoutFontCacheEntry { self.layout_font_cache.push(LayoutFontCacheEntry {
@ -185,7 +186,7 @@ impl FontContext {
for cached_font_entry in self.fallback_font_cache.iter() { for cached_font_entry in self.fallback_font_cache.iter() {
let cached_font = cached_font_entry.font.borrow(); let cached_font = cached_font_entry.font.borrow();
if cached_font.descriptor == desc && if cached_font.descriptor == desc &&
cached_font.requested_pt_size == style.font_size.to_subpx() && cached_font.requested_pt_size == style.font_size &&
cached_font.variant == style.font_variant { cached_font.variant == style.font_variant {
fonts.push(cached_font_entry.font.clone()); fonts.push(cached_font_entry.font.clone());
cache_hit = true; cache_hit = true;
@ -197,7 +198,7 @@ impl FontContext {
let font_template = self.font_cache_task.get_last_resort_font_template(desc.clone()); let font_template = self.font_cache_task.get_last_resort_font_template(desc.clone());
let layout_font = self.create_layout_font(font_template, let layout_font = self.create_layout_font(font_template,
desc.clone(), desc.clone(),
style.font_size.to_subpx(), style.font_size,
style.font_variant); style.font_variant);
let layout_font = Rc::new(RefCell::new(layout_font)); let layout_font = Rc::new(RefCell::new(layout_font));
self.fallback_font_cache.push(FallbackFontCacheEntry { self.fallback_font_cache.push(FallbackFontCacheEntry {
@ -214,7 +215,7 @@ impl FontContext {
/// reference if already used by this font context. /// reference if already used by this font context.
pub fn get_render_font_from_template(&mut self, pub fn get_render_font_from_template(&mut self,
template: &Arc<FontTemplateData>, template: &Arc<FontTemplateData>,
pt_size: f64) -> Rc<RefCell<ScaledFont>> { pt_size: Au) -> Rc<RefCell<ScaledFont>> {
for cached_font in self.render_font_cache.iter() { for cached_font in self.render_font_cache.iter() {
if cached_font.pt_size == pt_size && if cached_font.pt_size == pt_size &&
cached_font.identifier == template.identifier { cached_font.identifier == template.identifier {

8
components/gfx/platform/freetype/font.rs
View file

@ -70,7 +70,7 @@ impl Drop for FontHandle {
impl FontHandleMethods for FontHandle { impl FontHandleMethods for FontHandle {
fn new_from_template(fctx: &FontContextHandle, fn new_from_template(fctx: &FontContextHandle,
template: Arc<FontTemplateData>, template: Arc<FontTemplateData>,
pt_size: Option<f64>) pt_size: Option<Au>)
-> Result<FontHandle, ()> { -> Result<FontHandle, ()> {
let ft_ctx: FT_Library = fctx.ctx.ctx; let ft_ctx: FT_Library = fctx.ctx.ctx;
if ft_ctx.is_null() { return Err(()); } if ft_ctx.is_null() { return Err(()); }
@ -93,7 +93,7 @@ impl FontHandleMethods for FontHandle {
Err(()) => Err(()) Err(()) => Err(())
}; };
fn create_face_from_buffer(lib: FT_Library, cbuf: *const u8, cbuflen: uint, pt_size: Option<f64>) fn create_face_from_buffer(lib: FT_Library, cbuf: *const u8, cbuflen: uint, pt_size: Option<Au>)
-> Result<FT_Face, ()> { -> Result<FT_Face, ()> {
unsafe { unsafe {
let mut face: FT_Face = ptr::null_mut(); let mut face: FT_Face = ptr::null_mut();
@ -265,8 +265,8 @@ impl FontHandleMethods for FontHandle {
} }
impl<'a> FontHandle { impl<'a> FontHandle {
fn set_char_size(face: FT_Face, pt_size: f64) -> Result<(), ()>{ fn set_char_size(face: FT_Face, pt_size: Au) -> Result<(), ()>{
let char_width = float_to_fixed_ft((0.5f64 + pt_size).floor()) as FT_F26Dot6; let char_width = float_to_fixed_ft((0.5f64 + pt_size.to_subpx()).floor()) as FT_F26Dot6;
unsafe { unsafe {
let result = FT_Set_Char_Size(face, char_width, 0, 0, 0); let result = FT_Set_Char_Size(face, char_width, 0, 0, 0);

4
components/gfx/platform/macos/font.rs
View file

@ -59,10 +59,10 @@ pub struct FontHandle {
impl FontHandleMethods for FontHandle { impl FontHandleMethods for FontHandle {
fn new_from_template(_fctx: &FontContextHandle, fn new_from_template(_fctx: &FontContextHandle,
template: Arc<FontTemplateData>, template: Arc<FontTemplateData>,
pt_size: Option<f64>) pt_size: Option<Au>)
-> Result<FontHandle, ()> { -> Result<FontHandle, ()> {
let size = match pt_size { let size = match pt_size {
Some(s) => s, Some(s) => s.to_subpx(),
None => 0.0 None => 0.0
}; };
match template.ctfont { match template.ctfont {

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

@ -164,7 +164,7 @@ impl Shaper {
let hb_font: *mut hb_font_t = hb_font_create(hb_face); let hb_font: *mut hb_font_t = hb_font_create(hb_face);
// Set points-per-em. if zero, performs no hinting in that direction. // Set points-per-em. if zero, performs no hinting in that direction.
let pt_size = font.actual_pt_size; let pt_size = font.actual_pt_size.to_subpx();
hb_font_set_ppem(hb_font, pt_size as c_uint, pt_size as c_uint); hb_font_set_ppem(hb_font, pt_size as c_uint, pt_size as c_uint);
// Set scaling. Note that this takes 16.16 fixed point. // Set scaling. Note that this takes 16.16 fixed point.

2
components/gfx/text/text_run.rs
View file

@ -17,7 +17,7 @@ use platform::font_template::FontTemplateData;
pub struct TextRun { pub struct TextRun {
pub text: Arc<String>, pub text: Arc<String>,
pub font_template: Arc<FontTemplateData>, pub font_template: Arc<FontTemplateData>,
pub actual_pt_size: f64, pub actual_pt_size: Au,
pub font_metrics: FontMetrics, pub font_metrics: FontMetrics,
/// The glyph runs that make up this text run. /// The glyph runs that make up this text run.
pub glyphs: Arc<Vec<GlyphRun>>, pub glyphs: Arc<Vec<GlyphRun>>,