Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update dwrote to 0.11.

Browse source
This commit is contained in:
Josh Matthews 2020-03-26 16:40:20 -04:00
parent 4dbe3b30cd
commit 57a0910cde
4 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -1327,6 +1327,20 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "dwrote"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
dependencies = [
"lazy_static",
"libc",
"serde",
"serde_derive",
"winapi",
"wio",
]
[[package]] [[package]]
name = "either" name = "either"
version = "1.5.2" version = "1.5.2"
@ -1538,7 +1552,7 @@ dependencies = [
"core-graphics 0.19.0", "core-graphics 0.19.0",
"core-text 15.0.0", "core-text 15.0.0",
"dirs 2.0.2", "dirs 2.0.2",
"dwrote", "dwrote 0.9.0",
"euclid", "euclid",
"float-ord", "float-ord",
"freetype", "freetype",
@ -1760,7 +1774,7 @@ dependencies = [
"core-foundation 0.6.4", "core-foundation 0.6.4",
"core-graphics 0.17.3", "core-graphics 0.17.3",
"core-text 13.2.0", "core-text 13.2.0",
"dwrote", "dwrote 0.11.0",
"euclid", "euclid",
"fnv", "fnv",
"fontsan", "fontsan",
@ -6570,7 +6584,7 @@ dependencies = [
"core-graphics 0.17.3", "core-graphics 0.17.3",
"core-text 13.2.0", "core-text 13.2.0",
"cstr", "cstr",
"dwrote", "dwrote 0.9.0",
"euclid", "euclid",
"freetype", "freetype",
"fxhash", "fxhash",

2
components/gfx/Cargo.toml
View file

@ -58,5 +58,5 @@ servo-fontconfig = "0.4"
xml-rs = "0.8" xml-rs = "0.8"
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.9" dwrote = "0.11"
truetype = "0.26" 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 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 em_size = pt_size.to_f32_px() / 16.;
let design_units_per_pixel = du_per_em / 16.; let design_units_per_pixel = du_per_em / 16.;
@ -368,7 +368,7 @@ impl FontHandleMethods for FontHandle {
} }
fn metrics(&self) -> FontMetrics { 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 = |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) }; let au_from_du_s = |du| -> Au { Au::from_f32_px(du as f32 * self.scaled_du_to_px) };

1
servo-tidy.toml
View file

@ -31,6 +31,7 @@ packages = [
"base64", "base64",
"cgl", "cgl",
"cocoa", "cocoa",
"dwrote",
"gleam", "gleam",
"peek-poke", "peek-poke",
"peek-poke-derive", "peek-poke-derive",