Auto merge of #27558 - jdm:revert-revert-wrup, r=Manishearth

Fix missing canvas text on UWP

This addresses the missing fonts under UWP by updating font-kit and assorted dependencies that all depend on older incompatible versions of freetype. This also works around #27492 by using a fork of webrender that cherry-picks required dependency updates without bringing in the commit that exposes an ANGLE crash.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #27515
- [x] These changes do not require tests because no UWP tests.
This commit is contained in:
bors-servo 2020-08-10 17:44:34 -04:00 committed by GitHub
commit ae10552074
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 260 additions and 128 deletions

View file

@ -22,10 +22,10 @@ canvas_traits = { path = "../canvas_traits" }
crossbeam-channel = "0.4"
cssparser = "0.27"
euclid = "0.20"
font-kit = "0.7"
font-kit = "0.10"
fnv = "1.0"
gfx = { path = "../gfx" }
gleam = "0.11"
gleam = "0.12"
half = "1"
ipc-channel = "0.14"
log = "0.4"
@ -33,7 +33,7 @@ lyon_geom = "0.14"
num-traits = "0.2"
pathfinder_geometry = "0.5"
pixels = { path = "../pixels" }
raqote = { version = "0.8", features = ["text"] }
raqote = { git = "https://github.com/jrmuizel/raqote", features = ["text"] }
servo_arc = { path = "../servo_arc" }
servo_config = { path = "../config" }
sparkle = "0.1.25"