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

Auto merge of #16523 - glennw:update-wr-drivers, r=metajack

Browse source 
Update WR (driver workaround, large clip mask fix, font index support).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16523)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-19 04:53:22 -05:00 • committed by GitHub
commit 0a54d5a025
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/gfx/font_cache_thread.rs
View file

@ -348,9 +348,9 @@ impl FontCache {
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(font_key, bytes),
(Some(bytes), _) => webrender_api.add_raw_font(font_key, bytes, 0),
(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()),
(None, None) => webrender_api.add_raw_font(font_key, template.bytes().clone(), 0),
}
font_key
}));