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

gfx: Make fonts that fail to match hit the cache too.

Browse source 
50%-100% layout perf improvement on CNN.
This commit is contained in:
Patrick Walton 2014-10-17 22:10:38 -07:00
parent e9a61c1ccf
commit 79f84a62fe
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/gfx/font_context.rs
View file

@ -43,7 +43,7 @@ static SMALL_CAPS_SCALE_FACTOR: f64 = 0.8; // Matches FireFox (see gfxFont.
struct LayoutFontCacheEntry { struct LayoutFontCacheEntry {
family: String, family: String,
font: Rc<RefCell<Font>>, font: Option<Rc<RefCell<Font>>>,
} }
struct FallbackFontCacheEntry { struct FallbackFontCacheEntry {
@ -132,13 +132,21 @@ impl FontContext {
let mut cache_hit = false; let mut cache_hit = false;
for cached_font_entry in self.layout_font_cache.iter() { for cached_font_entry in self.layout_font_cache.iter() {
if cached_font_entry.family.as_slice() == family.name() { if cached_font_entry.family.as_slice() == family.name() {
let cached_font = cached_font_entry.font.borrow(); match cached_font_entry.font {
if cached_font.descriptor == desc && None => {
cached_font.requested_pt_size == style.font_size.to_subpx() && cache_hit = true;
cached_font.variant == style.font_variant { break;
fonts.push(cached_font_entry.font.clone()); }
cache_hit = true; Some(ref cached_font_ref) => {
break; let cached_font = cached_font_ref.borrow();
if cached_font.descriptor == desc &&
cached_font.requested_pt_size == style.font_size.to_subpx() &&
cached_font.variant == style.font_variant {
fonts.push((*cached_font_ref).clone());
cache_hit = true;
break;
}
}
} }
} }
} }
@ -156,11 +164,16 @@ impl FontContext {
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 {
family: family.name().to_string(), family: family.name().to_string(),
font: layout_font.clone(), font: Some(layout_font.clone()),
}); });
fonts.push(layout_font); fonts.push(layout_font);
} }
None => {} None => {
self.layout_font_cache.push(LayoutFontCacheEntry {
family: family.name().to_string(),
font: None,
});
}
} }
} }
} }