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

Auto merge of #11702 - nox:fonts, r=metajack

Browse source 
Don't load all font faces sources

We stop at the first one we manage to load.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11702)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-10 14:52:55 -05:00 • committed by GitHub
commit ce88b8ed30
4 changed files with 131 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/unit/gfx/font_cache_thread.rs
View file

@ -5,17 +5,21 @@
use gfx::font_cache_thread::FontCacheThread;
use ipc_channel::ipc;
use style::computed_values::font_family::FontFamily;
use style::font_face::Source;
use style::font_face::{FontFaceRule, Source};
#[test]
fn test_local_web_font() {
let (inp_chan, _) = ipc::channel().unwrap();
let (out_chan, out_receiver) = ipc::channel().unwrap();
let font_cache_thread = FontCacheThread::new(inp_chan, None);
let family_name = FontFamily::FamilyName(From::from("test family"));
let variant_name = FontFamily::FamilyName(From::from("test font face"));
let (inp_chan, _) = ipc::channel().unwrap();
let (out_chan, out_receiver) = ipc::channel().unwrap();
let font_cache_thread = FontCacheThread::new(inp_chan, None);
let family_name = FontFamily::FamilyName(From::from("test family"));
let variant_name = FontFamily::FamilyName(From::from("test font face"));
let font_face_rule = FontFaceRule {
family: family_name.clone(),
sources: vec![Source::Local(variant_name)],
};
font_cache_thread.add_web_font(family_name, Source::Local(variant_name), out_chan);
font_cache_thread.add_web_font(family_name, font_face_rule.effective_sources(), out_chan);
assert_eq!(out_receiver.recv().unwrap(), ());
assert_eq!(out_receiver.recv().unwrap(), ());
}