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

Update WR (image tiling, inset box shadow fixes, new key api).

Browse source
This commit is contained in:
Glenn Watson 2017-02-27 08:54:28 +10:00
parent 261df34ced
commit 64a9a45b2a
6 changed files with 43 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/gfx/font_cache_thread.rs
View file

@ -346,11 +346,13 @@ impl FontCache {
if let Some(ref webrender_api) = self.webrender_api {
let webrender_fonts = &mut self.webrender_fonts;
font_key = Some(*webrender_fonts.entry(template.identifier.clone()).or_insert_with(|| {
let font_key = webrender_api.generate_font_key();
match (template.bytes_if_in_memory(), template.native_font()) {
(Some(bytes), _) => webrender_api.add_raw_font(bytes),
(None, Some(native_font)) => webrender_api.add_native_font(native_font),
(None, None) => webrender_api.add_raw_font(template.bytes().clone()),
(Some(bytes), _) => webrender_api.add_raw_font(font_key, bytes),
(None, Some(native_font)) => webrender_api.add_native_font(font_key, native_font),
(None, None) => webrender_api.add_raw_font(font_key, template.bytes().clone()),
}
font_key
}));
}