Revert "Update webrender."

This reverts commit 2ca1b06e77f28cebeb886f50a6c21c438d4b2f46.

8 files changed, 73 insertions, 35 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 967f78829d1..bbe06862931 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -538,7 +538,7 @@ dependencies = [
  "fnv",
  "font-kit",
  "gfx",
- "gleam 0.12.1",
+ "gleam 0.11.0",
  "half",
  "ipc-channel",
  "log",
@@ -813,7 +813,7 @@ dependencies = [
  "embedder_traits",
  "euclid",
  "gfx_traits",
- "gleam 0.12.1",
+ "gleam 0.11.0",
  "image",
  "ipc-channel",
  "keyboard-types",
@@ -1014,6 +1014,18 @@ dependencies = [
 
 [[package]]
 name = "core-text"
+version = "15.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "131b3fd1f8bd5db9f2b398fa4fdb6008c64afc04d447c306ac2c7e98fba2a61d"
+dependencies = [
+ "core-foundation 0.7.0",
+ "core-graphics 0.19.0",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-text"
 version = "19.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2"
@@ -1580,11 +1592,11 @@ dependencies = [
  "byteorder",
  "core-foundation 0.9.0",
  "core-graphics 0.22.0",
- "core-text",
+ "core-text 19.0.0",
  "dirs",
  "dwrote",
  "float-ord",
- "freetype",
+ "freetype 0.7.0",
  "lazy_static",
  "libc",
  "log",
@@ -1622,6 +1634,16 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "freetype"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11926b2b410b469d0e9399eca4cbbe237a9ef02176c485803b29216307e8e028"
+dependencies = [
+ "libc",
+ "servo-freetype-sys",
+]
+
+[[package]]
+name = "freetype"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
@@ -1849,14 +1871,14 @@ dependencies = [
  "app_units",
  "bitflags",
  "byteorder",
- "core-foundation 0.9.0",
- "core-graphics 0.22.0",
- "core-text",
+ "core-foundation 0.7.0",
+ "core-graphics 0.19.0",
+ "core-text 15.0.0",
  "dwrote",
  "euclid",
  "fnv",
  "fontsan",
- "freetype",
+ "freetype 0.7.0",
  "gfx_traits",
  "harfbuzz-sys",
  "ipc-channel",
@@ -2080,9 +2102,9 @@ dependencies = [
 
 [[package]]
 name = "gleam"
-version = "0.12.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdef5b9df6d3a261b80a5ac55e13bf93945725df2463c1b0a2e5a527dce0d37"
+checksum = "d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"
 dependencies = [
  "gl_generator 0.14.0",
 ]
@@ -2477,9 +2499,9 @@ checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467"
 dependencies = [
  "cc",
  "core-graphics 0.22.0",
- "core-text",
+ "core-text 19.0.0",
  "foreign-types",
- "freetype",
+ "freetype 0.7.0",
  "pkg-config",
 ]
 
@@ -3191,7 +3213,7 @@ dependencies = [
  "gaol",
  "gfx",
  "gfx_traits",
- "gleam 0.12.1",
+ "gleam 0.11.0",
  "gstreamer",
  "ipc-channel",
  "keyboard-types",
@@ -4175,7 +4197,7 @@ dependencies = [
 [[package]]
 name = "peek-poke"
 version = "0.2.0"
-source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
+source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
 dependencies = [
  "euclid",
  "peek-poke-derive",
@@ -4184,7 +4206,7 @@ dependencies = [
 [[package]]
 name = "peek-poke-derive"
 version = "0.2.1"
-source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
+source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
 dependencies = [
  "proc-macro2 1.0.17",
  "quote 1.0.2",
@@ -5130,6 +5152,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "servo-freetype-sys"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b"
+dependencies = [
+ "cmake",
+ "pkg-config",
+]
+
+[[package]]
 name = "servo-gst-plugin"
 version = "0.0.1"
 dependencies = [
@@ -6786,23 +6818,24 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.61.0"
-source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
+source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
 dependencies = [
+ "backtrace",
  "base64 0.10.1",
  "bincode",
  "bitflags",
  "build-parallel",
  "byteorder",
  "cfg-if",
- "core-foundation 0.9.0",
- "core-graphics 0.22.0",
- "core-text",
+ "core-foundation 0.7.0",
+ "core-graphics 0.19.0",
+ "core-text 15.0.0",
  "cstr",
  "dwrote",
  "euclid",
- "freetype",
+ "freetype 0.4.1",
  "fxhash",
- "gleam 0.12.1",
+ "gleam 0.11.0",
  "glslopt",
  "image",
  "lazy_static",
@@ -6815,11 +6848,11 @@ dependencies = [
  "ron",
  "serde",
  "serde_json",
+ "sig",
  "smallvec 1.4.1",
  "svg_fmt",
  "time",
  "tracy-rs",
- "uuid",
  "webrender_api",
  "webrender_build",
  "wr_malloc_size_of",
@@ -6829,13 +6862,13 @@ dependencies = [
 [[package]]
 name = "webrender_api"
 version = "0.61.0"
-source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
+source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
 dependencies = [
  "app_units",
  "bitflags",
  "byteorder",
- "core-foundation 0.9.0",
- "core-graphics 0.22.0",
+ "core-foundation 0.7.0",
+ "core-graphics 0.19.0",
  "derive_more",
  "euclid",
  "malloc_size_of_derive",
@@ -6850,7 +6883,7 @@ dependencies = [
 [[package]]
 name = "webrender_build"
 version = "0.0.1"
-source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
+source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
 dependencies = [
  "bitflags",
  "lazy_static",
@@ -7029,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "wr_malloc_size_of"
 version = "0.0.1"
-source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
+source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
 dependencies = [
  "app_units",
  "euclid",
diff --git a/Cargo.toml b/Cargo.toml
index 79b5a962adf..58346500b9a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,3 +34,8 @@ backtrace = { git = "https://github.com/servo/backtrace-rs", branch = "uwp-fix"
 
 [patch."https://github.com/jrmuizel/raqote"]
 raqote = { git = "https://github.com/jdm/raqote", branch = "fkup" }
+
+# https://github.com/servo/servo/issues/27039#issuecomment-654400150
+[patch."https://github.com/servo/webrender"]
+webrender = { git = "https://github.com/jdm/webrender", branch = "crash-backtrace" }
+webrender_api = { git = "https://github.com/jdm/webrender", branch = "crash-backtrace" }
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index e2789742ac7..71f870a634e 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -25,7 +25,7 @@ euclid = "0.20"
 font-kit = "0.10"
 fnv = "1.0"
 gfx = { path = "../gfx" }
-gleam = "0.12"
+gleam = "0.11"
 half = "1"
 ipc-channel = "0.14"
 log = "0.4"
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 048344af294..0d4fc881921 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -21,7 +21,7 @@ crossbeam-channel = "0.4"
 embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 gfx_traits = { path = "../gfx_traits" }
-gleam = { version = "0.12", optional = true }
+gleam = { version = "0.11", optional = true }
 image = "0.23"
 ipc-channel = "0.14"
 keyboard-types = "0.5"
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 0d96a7ed783..947918e6da8 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -43,9 +43,9 @@ xi-unicode = "0.1.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 byteorder = "1.0"
-core-foundation = "0.9"
-core-graphics = "0.22"
-core-text = "19.0"
+core-foundation = "0.7"
+core-graphics = "0.19"
+core-text = "15.0"
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 freetype = "0.7"
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 3960ec97c47..3b653fcac84 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -54,7 +54,7 @@ env_logger = "0.7"
 euclid = "0.20"
 gfx = { path = "../gfx" }
 gfx_traits = { path = "../gfx_traits" }
-gleam = "0.12"
+gleam = "0.11"
 gstreamer = { version = "0.15", features = ["v1_16"], optional = true }
 ipc-channel = "0.14"
 keyboard-types = "0.5"
diff --git a/servo-tidy.toml b/servo-tidy.toml
index 435bf8f52f7..f26234f551d 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -32,6 +32,7 @@ packages = [
   "arrayvec",
   "base64",
   "cocoa",
+  "freetype",
   "gleam",
   "libloading",
   "metal",
diff --git a/tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini b/tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini
index d74202a2080..10e6dc50956 100644
--- a/tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini
@@ -1,4 +1,3 @@
 [background-image-tiled.https.html]
   type: reftest
-  expected: CRASH
-  bug: https://github.com/servo/servo/issues/27467
+  expected: FAIL