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

gfx: Instantiate the CTFont corresponding to a Mac font on demand.

Browse source 
This avoids panics in multiprocess mode.
This commit is contained in:
Patrick Walton 2015-07-27 14:18:50 -07:00
parent 1ff7a51f0a
commit e9ec9289d6
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/font_context.rs
View file

@ -42,7 +42,7 @@ fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: Au) -> ScaledFo
#[cfg(target_os="macos")] #[cfg(target_os="macos")]
fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: Au) -> 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(BackendType::Skia, &cgfont, pt_size.to_f32_px()) ScaledFont::new(BackendType::Skia, &cgfont, pt_size.to_f32_px())
} }

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

@ -64,7 +64,7 @@ impl FontHandleMethods for FontHandle {
Some(s) => s.to_f64_px(), Some(s) => s.to_f64_px(),
None => 0.0 None => 0.0
}; };
match *template.ctfont { match template.ctfont() {
Some(ref ctfont) => { Some(ref ctfont) => {
Ok(FontHandle { Ok(FontHandle {
font_data: template.clone(), font_data: template.clone(),

22
components/gfx/platform/macos/font_template.rs
View file

@ -11,6 +11,7 @@ use serde::de::{Error, Visitor};
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::ops::Deref; use std::ops::Deref;
use std::sync::Mutex;
use string_cache::Atom; use string_cache::Atom;
/// Platform specific font representation for mac. /// Platform specific font representation for mac.
@ -26,7 +27,7 @@ pub struct FontTemplateData {
/// When sending a `FontTemplateData` instance across processes, this will be set to `None` on /// When sending a `FontTemplateData` instance across processes, this will be set to `None` on
/// the other side, because `CTFont` instances cannot be sent across processes. This is /// the other side, because `CTFont` instances cannot be sent across processes. This is
/// harmless, however, because it can always be recreated. /// harmless, however, because it can always be recreated.
pub ctfont: CachedCTFont, ctfont: CachedCTFont,
pub identifier: Atom, pub identifier: Atom,
pub font_data: Option<Vec<u8>> pub font_data: Option<Vec<u8>>
@ -52,18 +53,27 @@ impl FontTemplateData {
}; };
FontTemplateData { FontTemplateData {
ctfont: CachedCTFont(ctfont), ctfont: CachedCTFont(Mutex::new(ctfont)),
identifier: identifier.to_owned(), identifier: identifier.to_owned(),
font_data: font_data font_data: font_data
} }
} }
/// Retrieves the Core Text font instance, instantiating it if necessary.
pub fn ctfont(&self) -> Option<CTFont> {
let mut ctfont = self.ctfont.lock().unwrap();
if ctfont.is_none() {
*ctfont = core_text::font::new_from_name(self.identifier.as_slice(), 0.0).ok()
}
ctfont.as_ref().map(|ctfont| (*ctfont).clone())
}
} }
pub struct CachedCTFont(Option<CTFont>); pub struct CachedCTFont(Mutex<Option<CTFont>>);
impl Deref for CachedCTFont { impl Deref for CachedCTFont {
type Target = Option<CTFont>; type Target = Mutex<Option<CTFont>>;
fn deref(&self) -> &Option<CTFont> { fn deref(&self) -> &Mutex<Option<CTFont>> {
&self.0 &self.0
} }
} }
@ -84,7 +94,7 @@ impl Deserialize for CachedCTFont {
#[inline] #[inline]
fn visit_none<E>(&mut self) -> Result<CachedCTFont,E> where E: Error { fn visit_none<E>(&mut self) -> Result<CachedCTFont,E> where E: Error {
Ok(CachedCTFont(None)) Ok(CachedCTFont(Mutex::new(None)))
} }
} }