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

Merge pull request #3362 from glennw/fix-layout-fonts

Browse source 
Fix font flickering due to missed check in font cache.
This commit is contained in:
glennw 2014-09-16 17:57:36 +10:00
commit 7a5f15f137
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
components/gfx/font_context.rs
View file

@ -38,6 +38,11 @@ fn create_scaled_font(backend: BackendType, template: &Arc<FontTemplateData>, pt
ScaledFont::new(backend, &cgfont, pt_size as AzFloat) ScaledFont::new(backend, &cgfont, pt_size as AzFloat)
} }
struct LayoutFontCacheEntry {
family: String,
font: Rc<RefCell<Font>>,
}
/// 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 {
@ -55,7 +60,7 @@ pub struct FontContext {
font_cache_task: FontCacheTask, font_cache_task: FontCacheTask,
/// TODO: See bug https://github.com/servo/servo/issues/3300. /// TODO: See bug https://github.com/servo/servo/issues/3300.
layout_font_cache: Vec<Rc<RefCell<Font>>>, layout_font_cache: Vec<LayoutFontCacheEntry>,
/// Strong reference as the render FontContext is (for now) recycled /// Strong reference as the render FontContext is (for now) recycled
/// per frame. TODO: Make this weak when incremental redraw is done. /// per frame. TODO: Make this weak when incremental redraw is done.
@ -105,19 +110,25 @@ impl FontContext {
// GWTODO: Check on real pages if this is faster as Vec() or HashMap(). // GWTODO: Check on real pages if this is faster as Vec() or HashMap().
let mut cache_hit = false; let mut cache_hit = false;
for cached_font in self.layout_font_cache.iter() { for cached_font_entry in self.layout_font_cache.iter() {
if cached_font.borrow().descriptor == desc && if cached_font_entry.family == *family {
cached_font.borrow().pt_size == style.pt_size { let cached_font = cached_font_entry.font.borrow();
fonts.push(cached_font.clone()); if cached_font.descriptor == desc &&
cache_hit = true; cached_font.pt_size == style.pt_size {
break; fonts.push(cached_font_entry.font.clone());
cache_hit = true;
break;
}
} }
} }
if !cache_hit { if !cache_hit {
let font_template = self.font_cache_task.get_font_template(family.clone(), desc.clone()); let font_template = self.font_cache_task.get_font_template(family.clone(), desc.clone());
let layout_font = Rc::new(RefCell::new(self.create_layout_font(font_template, desc.clone(), style.pt_size))); let layout_font = Rc::new(RefCell::new(self.create_layout_font(font_template, desc.clone(), style.pt_size)));
self.layout_font_cache.push(layout_font.clone()); self.layout_font_cache.push(LayoutFontCacheEntry {
family: family.clone(),
font: layout_font.clone(),
});
fonts.push(layout_font); fonts.push(layout_font);
} }
} }