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

Auto merge of #9173 - pcwalton:remove-font-group-address-cache, r=mbrubeck

Browse source 
Remove the fontgroup address cache.

It's not clear to me that it actually helps. Moreover, it's wrong and
results in fonts randomly changing e.g. on GitHub when mousing over
elements.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9173)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-07 09:15:45 +05:30
commit 6eb28c7fd8
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/gfx/font_context.rs
View file

@ -85,8 +85,6 @@ pub struct FontContext {
/// per frame. TODO: Make this weak when incremental redraw is done. /// per frame. TODO: Make this weak when incremental redraw is done.
paint_font_cache: Vec<PaintFontCacheEntry>, paint_font_cache: Vec<PaintFontCacheEntry>,
layout_font_group_address_cache: HashMap<usize, Rc<FontGroup>, DefaultState<FnvHasher>>,
layout_font_group_cache: layout_font_group_cache:
HashMap<LayoutFontGroupCacheKey, Rc<FontGroup>, DefaultState<FnvHasher>>, HashMap<LayoutFontGroupCacheKey, Rc<FontGroup>, DefaultState<FnvHasher>>,
@ -102,7 +100,6 @@ impl FontContext {
layout_font_cache: vec!(), layout_font_cache: vec!(),
fallback_font_cache: vec!(), fallback_font_cache: vec!(),
paint_font_cache: vec!(), paint_font_cache: vec!(),
layout_font_group_address_cache: HashMap::with_hash_state(Default::default()),
layout_font_group_cache: HashMap::with_hash_state(Default::default()), layout_font_group_cache: HashMap::with_hash_state(Default::default()),
epoch: 0, epoch: 0,
} }
@ -150,7 +147,6 @@ impl FontContext {
self.layout_font_cache.clear(); self.layout_font_cache.clear();
self.fallback_font_cache.clear(); self.fallback_font_cache.clear();
self.paint_font_cache.clear(); self.paint_font_cache.clear();
self.layout_font_group_address_cache.clear();
self.layout_font_group_cache.clear(); self.layout_font_group_cache.clear();
self.epoch = current_epoch self.epoch = current_epoch
} }
@ -162,18 +158,12 @@ impl FontContext {
-> Rc<FontGroup> { -> Rc<FontGroup> {
self.expire_font_caches_if_necessary(); self.expire_font_caches_if_necessary();
let address = &*style as *const SpecifiedFontStyle as usize;
if let Some(ref cached_font_group) = self.layout_font_group_address_cache.get(&address) {
return (*cached_font_group).clone()
}
let layout_font_group_cache_key = LayoutFontGroupCacheKey { let layout_font_group_cache_key = LayoutFontGroupCacheKey {
pointer: style.clone(), pointer: style.clone(),
size: style.font_size, size: style.font_size,
}; };
if let Some(ref cached_font_group) = self.layout_font_group_cache.get( if let Some(ref cached_font_group) = self.layout_font_group_cache.get(
&layout_font_group_cache_key) { &layout_font_group_cache_key) {
self.layout_font_group_address_cache.insert(address, (*cached_font_group).clone());
return (*cached_font_group).clone() return (*cached_font_group).clone()
} }
@ -281,7 +271,6 @@ impl FontContext {
let font_group = Rc::new(FontGroup::new(fonts)); let font_group = Rc::new(FontGroup::new(fonts));
self.layout_font_group_cache.insert(layout_font_group_cache_key, font_group.clone()); self.layout_font_group_cache.insert(layout_font_group_cache_key, font_group.clone());
self.layout_font_group_address_cache.insert(address, font_group.clone());
font_group font_group
} }