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

Auto merge of #22074 - jdm:wrup, r=nox

Browse source 
Update webrender.

Fixes #22114.

<!-- 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/22074)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-11-07 00:40:42 -05:00 • committed by GitHub
commit 618a790050
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 82 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/Cargo.toml
View file

@ -63,5 +63,5 @@ servo-fontconfig = "0.2.1"
xml5ever = {version = "0.12"}
[target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.5"
dwrote = "0.6"
truetype = "0.26"

2
components/gfx/platform/windows/font.rs
View file

@ -272,7 +272,7 @@ impl FontHandleMethods for FontHandle {
pt_size: Option<Au>,
) -> Result<Self, ()> {
let (info, face) = if let Some(ref raw_font) = template.bytes {
let font_file = FontFile::new_from_data(&raw_font);
let font_file = FontFile::new_from_data(Arc::new(raw_font.clone()));
if font_file.is_none() {
// failed to load raw font
return Err(());