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

Auto merge of #26041 - jdm:dwrote-up, r=asajeffrey

Browse source 
Update dwrote to 0.11.

Fix #25962.
This commit is contained in:
bors-servo 2020-03-30 20:25:40 -04:00 • committed by GitHub
commit 029049b486
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/Cargo.toml
View file

@ -58,5 +58,5 @@ servo-fontconfig = "0.4"
xml-rs = "0.8"
[target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.9"
dwrote = "0.11"
truetype = "0.26"

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

@ -292,7 +292,7 @@ impl FontHandleMethods for FontHandle {
};
let pt_size = pt_size.unwrap_or(au_from_pt(12.));
let du_per_em = face.metrics().designUnitsPerEm as f32;
let du_per_em = face.metrics().metrics0().designUnitsPerEm as f32;
let em_size = pt_size.to_f32_px() / 16.;
let design_units_per_pixel = du_per_em / 16.;
@ -368,7 +368,7 @@ impl FontHandleMethods for FontHandle {
}
fn metrics(&self) -> FontMetrics {
let dm = self.face.metrics();
let dm = self.face.metrics().metrics0();
let au_from_du = |du| -> Au { Au::from_f32_px(du as f32 * self.du_to_px) };
let au_from_du_s = |du| -> Au { Au::from_f32_px(du as f32 * self.scaled_du_to_px) };