From bfa1e08c40d99ea7dc2d19a714967f725279caea Mon Sep 17 00:00:00 2001
From: atouchet <alextouchet@outlook.com>
Date: Tue, 12 May 2020 21:57:04 -0700
Subject: [PATCH] Dedupe dwrote

---
 Cargo.lock                          | 57 +++++++++++++++--------------
 components/canvas/Cargo.toml        | 29 +++++++--------
 components/canvas_traits/Cargo.toml |  8 ++--
 servo-tidy.toml                     |  3 +-
 4 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c6664024cb17..e0c01e7fd8de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1315,17 +1315,6 @@ dependencies = [
  "dtoa",
 ]
 
-[[package]]
-name = "dwrote"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd1369e02db5e9b842a9b67bce8a2fcc043beafb2ae8a799dd482d46ea1ff0d"
-dependencies = [
- "lazy_static",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "dwrote"
 version = "0.11.0"
@@ -1542,23 +1531,24 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 
 [[package]]
 name = "font-kit"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b6e2b877097ffd0abac6597fea26fccb5ed7eb9da0a4094f11ccc8aba64efb"
+checksum = "0350420e88ba5f7d732247260d10e45a5cd13514c2fee8621a3f9a4bcba0ad81"
 dependencies = [
+ "bitflags",
  "byteorder",
  "core-foundation 0.7.0",
  "core-graphics 0.19.0",
  "core-text 15.0.0",
  "dirs",
- "dwrote 0.9.0",
- "euclid",
+ "dwrote",
  "float-ord",
  "freetype",
  "lazy_static",
  "libc",
  "log",
- "lyon_path",
+ "pathfinder_geometry",
+ "pathfinder_simd",
  "servo-fontconfig",
  "walkdir",
  "winapi",
@@ -1773,7 +1763,7 @@ dependencies = [
  "core-foundation 0.7.0",
  "core-graphics 0.19.0",
  "core-text 15.0.0",
- "dwrote 0.11.0",
+ "dwrote",
  "euclid",
  "fnv",
  "fontsan",
@@ -3206,15 +3196,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "lyon_path"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bcb57ac24a5428539e2c7c0592766d5933c937d703f430990c669c00de96862"
-dependencies = [
- "lyon_geom 0.14.0",
-]
-
 [[package]]
 name = "lzw"
 version = "0.10.0"
@@ -3931,6 +3912,25 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "pathfinder_geometry"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3"
+dependencies = [
+ "log",
+ "pathfinder_simd",
+]
+
+[[package]]
+name = "pathfinder_simd"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b451513912d6b3440e443aa75a73ab22203afedc4a90df8526d008c0f86f7cb3"
+dependencies = [
+ "rustc_version",
+]
+
 [[package]]
 name = "peek-poke"
 version = "0.2.0"
@@ -4300,11 +4300,12 @@ checksum = "dd5927936723a9e8b715d37d7e4b390455087c4bdf25b9f702309460577b14f9"
 [[package]]
 name = "raqote"
 version = "0.7.15-alpha.0"
-source = "git+https://github.com/jrmuizel/raqote#357934688fd31056cb243a9304d74f022ed3069f"
+source = "git+https://github.com/jrmuizel/raqote#517cce640eb392fb9a40efd2bb10b09b06e29756"
 dependencies = [
  "euclid",
  "font-kit",
  "lyon_geom 0.15.0",
+ "pathfinder_geometry",
  "png",
  "sw-composite",
  "typed-arena",
@@ -6393,7 +6394,7 @@ dependencies = [
  "core-graphics 0.19.0",
  "core-text 15.0.0",
  "cstr",
- "dwrote 0.11.0",
+ "dwrote",
  "euclid",
  "freetype",
  "fxhash",
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 607ac99c5013..f4d56e6e57da 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -11,18 +11,17 @@ name = "canvas"
 path = "lib.rs"
 
 [features]
-webgl_backtrace = ["canvas_traits/webgl_backtrace"]
 no-wgl = ["surfman/sm-no-wgl"]
+webgl_backtrace = ["canvas_traits/webgl_backtrace"]
 xr-profile = ["webxr-api/profile", "time"]
 
-
 [dependencies]
 bitflags = "1.0"
 byteorder = "1"
-canvas_traits = {path = "../canvas_traits"}
+canvas_traits = { path = "../canvas_traits" }
 crossbeam-channel = "0.4"
 cssparser = "0.27"
-embedder_traits = {path = "../embedder_traits"}
+embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 fnv = "1.0"
 gleam = "0.11"
@@ -31,17 +30,17 @@ ipc-channel = "0.14"
 log = "0.4"
 lyon_geom = "0.14"
 num-traits = "0.2"
-raqote = {git = "https://github.com/jrmuizel/raqote"}
-time = { version = "0.1.0", optional = true }
-pixels = {path = "../pixels"}
-servo_config = {path = "../config"}
+pixels = { path = "../pixels" }
+raqote = { git = "https://github.com/jrmuizel/raqote" }
+servo_config = { path = "../config" }
 sparkle = "0.1.24"
-webrender = {git = "https://github.com/servo/webrender"}
-webrender_api = {git = "https://github.com/servo/webrender"}
-webrender_surfman = {path = "../webrender_surfman"}
-webrender_traits = {path = "../webrender_traits"}
-webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
-# NOTE: the sm-angle feature only enables angle on windows, not other platforms!
-surfman = { version = "0.2", features = ["sm-angle","sm-angle-default"] }
+# NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms!
+surfman = { version = "0.2", features = ["sm-angle", "sm-angle-default"] }
 surfman-chains = "0.3"
 surfman-chains-api = "0.2"
+time = { version = "0.1.0", optional = true }
+webrender = { git = "https://github.com/servo/webrender" }
+webrender_api = { git = "https://github.com/servo/webrender" }
+webrender_surfman = { path = "../webrender_surfman" }
+webrender_traits = { path = "../webrender_traits" }
+webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index fcf636f79d55..0625221a4843 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -22,11 +22,11 @@ ipc-channel = "0.14"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
-pixels = {path = "../pixels"}
+pixels = { path = "../pixels" }
 serde = "1.0"
 serde_bytes = "0.11"
-servo_config = {path = "../config"}
+servo_config = { path = "../config" }
 sparkle = "0.1"
 time = { version = "0.1.0", optional = true }
-webrender_api = {git = "https://github.com/servo/webrender"}
-webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
+webrender_api = { git = "https://github.com/servo/webrender" }
+webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
diff --git a/servo-tidy.toml b/servo-tidy.toml
index 73220f9aea29..2673a5d4a247 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -30,11 +30,10 @@ packages = [
   "arrayvec",
   "base64",
   "cocoa",
-  "dwrote",
   "gleam",
+  "libloading",
   "peek-poke",
   "peek-poke-derive",
-  "libloading",
   "wayland-sys",
 
   # https://github.com/servo/servo/pull/23288#issuecomment-494687746