diff options
| author | bors-servo <servo-ops@mozilla.com> | 2020-03-30 20:25:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 20:25:40 -0400 |
| commit | 029049b48630f426ac5face4d9a9c0cd5195c66c (patch) | |
| tree | e5e272f9e7eda5370bec8209a757f169accb5e04 | |
| parent | 77b02393fb0fd3e17893f7f82492eeb741dd893e (diff) | |
| parent | 57a0910cde6ed9d2888b310286c0e199a0a39cea (diff) | |
| download | servo-029049b48630f426ac5face4d9a9c0cd5195c66c.tar.gz servo-029049b48630f426ac5face4d9a9c0cd5195c66c.zip | |
Auto merge of #26041 - jdm:dwrote-up, r=asajeffrey
Update dwrote to 0.11.
Fix #25962.
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | components/gfx/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/gfx/platform/windows/font.rs | 4 | ||||
| -rw-r--r-- | servo-tidy.toml | 1 |
4 files changed, 21 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5960b5c9eb8..9f7a39234e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1328,6 +1328,20 @@ dependencies = [ ] [[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]] name = "either" version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1538,7 +1552,7 @@ dependencies = [ "core-graphics 0.19.0", "core-text 15.0.0", "dirs 2.0.2", - "dwrote", + "dwrote 0.9.0", "euclid", "float-ord", "freetype", @@ -1760,7 +1774,7 @@ dependencies = [ "core-foundation 0.6.4", "core-graphics 0.17.3", "core-text 13.2.0", - "dwrote", + "dwrote 0.11.0", "euclid", "fnv", "fontsan", @@ -6571,7 +6585,7 @@ dependencies = [ "core-graphics 0.17.3", "core-text 13.2.0", "cstr", - "dwrote", + "dwrote 0.9.0", "euclid", "freetype", "fxhash", diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 42082e76310..bc7507fd87b 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -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" diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs index b933bdfb975..8154c066714 100644 --- a/components/gfx/platform/windows/font.rs +++ b/components/gfx/platform/windows/font.rs @@ -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) }; diff --git a/servo-tidy.toml b/servo-tidy.toml index 1a658e8429d..d308abedc4a 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -31,6 +31,7 @@ packages = [ "base64", "cgl", "cocoa", + "dwrote", "gleam", "peek-poke", "peek-poke-derive", |