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

Remove always-empty FontContext::paint_font_cache.

Browse source
This commit is contained in:
Ms2ger 2016-10-31 15:19:22 +01:00
parent 4ace1c1906
commit 91a41b7641
1 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/gfx/font_context.rs
View file

@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use app_units::Au; use app_units::Au;
use azure::scaled_font::ScaledFont;
use fnv::FnvHasher; use fnv::FnvHasher;
use font::{Font, FontGroup, FontHandleMethods}; use font::{Font, FontGroup, FontHandleMethods};
use font_cache_thread::FontCacheThread; use font_cache_thread::FontCacheThread;
@ -20,7 +19,6 @@ use std::hash::{BuildHasherDefault, Hash, Hasher};
use std::rc::Rc; use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT}; use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
use string_cache::Atom;
use style::computed_values::{font_style, font_variant}; use style::computed_values::{font_style, font_variant};
use style::properties::style_structs; use style::properties::style_structs;
use webrender_traits; use webrender_traits;
@ -38,15 +36,6 @@ struct FallbackFontCacheEntry {
font: Rc<RefCell<Font>>, font: Rc<RefCell<Font>>,
} }
/// A cached azure font (per paint thread) that
/// can be shared by multiple text runs.
#[derive(Debug)]
struct PaintFontCacheEntry {
pt_size: Au,
identifier: Atom,
font: Rc<RefCell<ScaledFont>>,
}
/// An epoch for the font context cache. The cache is flushed if the current epoch does not match /// An epoch for the font context cache. The cache is flushed if the current epoch does not match
/// this one. /// this one.
static FONT_CACHE_EPOCH: AtomicUsize = ATOMIC_USIZE_INIT; static FONT_CACHE_EPOCH: AtomicUsize = ATOMIC_USIZE_INIT;
@ -64,10 +53,6 @@ pub struct FontContext {
layout_font_cache: Vec<LayoutFontCacheEntry>, layout_font_cache: Vec<LayoutFontCacheEntry>,
fallback_font_cache: Vec<FallbackFontCacheEntry>, fallback_font_cache: Vec<FallbackFontCacheEntry>,
/// Strong reference as the paint FontContext is (for now) recycled
/// per frame. TODO: Make this weak when incremental redraw is done.
paint_font_cache: Vec<PaintFontCacheEntry>,
layout_font_group_cache: layout_font_group_cache:
HashMap<LayoutFontGroupCacheKey, Rc<FontGroup>, BuildHasherDefault<FnvHasher>>, HashMap<LayoutFontGroupCacheKey, Rc<FontGroup>, BuildHasherDefault<FnvHasher>>,
@ -82,7 +67,6 @@ impl FontContext {
font_cache_thread: font_cache_thread, font_cache_thread: font_cache_thread,
layout_font_cache: vec!(), layout_font_cache: vec!(),
fallback_font_cache: vec!(), fallback_font_cache: vec!(),
paint_font_cache: vec!(),
layout_font_group_cache: HashMap::with_hasher(Default::default()), layout_font_group_cache: HashMap::with_hasher(Default::default()),
epoch: 0, epoch: 0,
} }
@ -118,7 +102,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.layout_font_group_cache.clear(); self.layout_font_group_cache.clear();
self.epoch = current_epoch self.epoch = current_epoch
} }