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

Stop using HashCache in gfx::font.

Browse source 
It does not seem to make the code any more understandable.
This commit is contained in:
Ms2ger 2016-07-07 12:15:01 +02:00
parent 1fabfee27e
commit 24fe6bc4da
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/gfx/font.rs
View file

@ -12,6 +12,7 @@ use smallvec::SmallVec;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cell::RefCell; use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::Rc; use std::rc::Rc;
use std::str; use std::str;
use std::sync::Arc; use std::sync::Arc;
@ -22,7 +23,6 @@ use text::glyph::{ByteIndex, GlyphData, GlyphId, GlyphStore};
use text::shaping::ShaperMethods; use text::shaping::ShaperMethods;
use time; use time;
use unicode_script::Script; use unicode_script::Script;
use util::cache::HashCache;
use webrender_traits; use webrender_traits;
macro_rules! ot_tag { macro_rules! ot_tag {
@ -109,8 +109,8 @@ pub struct Font {
pub requested_pt_size: Au, pub requested_pt_size: Au,
pub actual_pt_size: Au, pub actual_pt_size: Au,
shaper: Option<Shaper>, shaper: Option<Shaper>,
shape_cache: RefCell<HashCache<ShapeCacheEntry, Arc<GlyphStore>>>, shape_cache: RefCell<HashMap<ShapeCacheEntry, Arc<GlyphStore>>>,
glyph_advance_cache: RefCell<HashCache<u32, FractionalPixel>>, glyph_advance_cache: RefCell<HashMap<u32, FractionalPixel>>,
pub font_key: Option<webrender_traits::FontKey>, pub font_key: Option<webrender_traits::FontKey>,
} }
@ -130,8 +130,8 @@ impl Font {
requested_pt_size: requested_pt_size, requested_pt_size: requested_pt_size,
actual_pt_size: actual_pt_size, actual_pt_size: actual_pt_size,
metrics: metrics, metrics: metrics,
shape_cache: RefCell::new(HashCache::new()), shape_cache: RefCell::new(HashMap::new()),
glyph_advance_cache: RefCell::new(HashCache::new()), glyph_advance_cache: RefCell::new(HashMap::new()),
font_key: font_key, font_key: font_key,
} }
} }
@ -180,7 +180,7 @@ impl Font {
text: text.to_owned(), text: text.to_owned(),
options: *options, options: *options,
}; };
let result = self.shape_cache.borrow_mut().find_or_create(lookup_key, || { let result = self.shape_cache.borrow_mut().entry(lookup_key).or_insert_with(|| {
let start_time = time::precise_time_ns(); let start_time = time::precise_time_ns();
let mut glyphs = GlyphStore::new(text.len(), let mut glyphs = GlyphStore::new(text.len(),
options.flags.contains(IS_WHITESPACE_SHAPING_FLAG), options.flags.contains(IS_WHITESPACE_SHAPING_FLAG),
@ -201,7 +201,7 @@ impl Font {
TEXT_SHAPING_PERFORMANCE_COUNTER.fetch_add((end_time - start_time) as usize, TEXT_SHAPING_PERFORMANCE_COUNTER.fetch_add((end_time - start_time) as usize,
Ordering::Relaxed); Ordering::Relaxed);
Arc::new(glyphs) Arc::new(glyphs)
}); }).clone();
self.shaper = shaper; self.shaper = shaper;
result result
} }
@ -269,7 +269,7 @@ impl Font {
} }
pub fn glyph_h_advance(&self, glyph: GlyphId) -> FractionalPixel { pub fn glyph_h_advance(&self, glyph: GlyphId) -> FractionalPixel {
self.glyph_advance_cache.borrow_mut().find_or_create(glyph, || { *self.glyph_advance_cache.borrow_mut().entry(glyph).or_insert_with(|| {
match self.handle.glyph_h_advance(glyph) { match self.handle.glyph_h_advance(glyph) {
Some(adv) => adv, Some(adv) => adv,
None => 10f64 as FractionalPixel // FIXME: Need fallback strategy None => 10f64 as FractionalPixel // FIXME: Need fallback strategy