From 514c7c5e05c5121de32d57ab27c7ecbaec7e9a25 Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Mon, 16 Sep 2019 19:28:08 +0300 Subject: [PATCH] Backed out changeset 5fe4ede89388 (bug 1581549) for causing SM bustages. CLOSED TREE --- gfx/wr/Cargo.lock | 10 +++++----- gfx/wr/direct-composition/Cargo.toml | 2 +- gfx/wr/webrender/Cargo.toml | 2 +- gfx/wr/wrench/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gfx/wr/Cargo.lock b/gfx/wr/Cargo.lock index 941380c02761..7a31bd40bfb8 100644 --- a/gfx/wr/Cargo.lock +++ b/gfx/wr/Cargo.lock @@ -423,7 +423,7 @@ version = "0.1.0" dependencies = [ "euclid 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", - "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mozangle 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "webrender 0.60.0", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -937,7 +937,7 @@ dependencies = [ [[package]] name = "mozangle" -version = "0.3.1" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1833,7 +1833,7 @@ dependencies = [ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mozangle 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "plane-split 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1994,7 +1994,7 @@ dependencies = [ "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mozangle 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-src 0.1.1 (git+https://github.com/servo/osmesa-src)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2177,7 +2177,7 @@ dependencies = [ "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -"checksum mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b74826530a7c9fffbe28d27d0499433bd51f67b4f45d658ba23e62499307cc17" +"checksum mozangle 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "75a61b5a06b6f362eb45590ddf2643c255768a7039bcde1dc70320b97e7f9651" "checksum net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "9044faf1413a1057267be51b5afba8eb1090bd2231c693664aa1db716fe1eae0" "checksum nix 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "319fffb13b63c0f4ff5a4e1c97566e7e741561ff5d03bf8bbf11653454bbd70b" "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" diff --git a/gfx/wr/direct-composition/Cargo.toml b/gfx/wr/direct-composition/Cargo.toml index 86114cb50bd9..ce8d598b002e 100644 --- a/gfx/wr/direct-composition/Cargo.toml +++ b/gfx/wr/direct-composition/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [target.'cfg(windows)'.dependencies] euclid = "0.20" gleam = "0.6.2" -mozangle = {version = "0.3.1", features = ["egl"]} +mozangle = {version = "0.2.7", features = ["egl"]} webrender = {path = "../webrender"} winapi = {version = "0.3", features = ["winerror", "d3d11", "dcomp"]} winit = "0.19" diff --git a/gfx/wr/webrender/Cargo.toml b/gfx/wr/webrender/Cargo.toml index 3910c95f4f84..a9da7ee2c626 100644 --- a/gfx/wr/webrender/Cargo.toml +++ b/gfx/wr/webrender/Cargo.toml @@ -54,7 +54,7 @@ ws = { optional = true, version = "0.9" } svg_fmt = "0.4" [dev-dependencies] -mozangle = "0.3.1" +mozangle = "0.2" rand = "0.4" [target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies] diff --git a/gfx/wr/wrench/Cargo.toml b/gfx/wr/wrench/Cargo.toml index d1fdde5332ea..60be1bdcc417 100644 --- a/gfx/wr/wrench/Cargo.toml +++ b/gfx/wr/wrench/Cargo.toml @@ -42,7 +42,7 @@ headless = [ "osmesa-sys", "osmesa-src" ] [target.'cfg(target_os = "windows")'.dependencies] dwrote = "0.9" -mozangle = {version = "0.3.1", features = ["egl"]} +mozangle = {version = "0.2", features = ["egl"]} [target.'cfg(all(unix, not(target_os = "android")))'.dependencies] font-loader = "0.7"