From ea3286ac6ab179f391dca82aa36476c23b53f167 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 28 Feb 2018 20:25:51 -0500 Subject: [PATCH] servo: Merge #20154 - Update WR (ipc deadlock workaround, clipped-filter fix) (from glennw:update-wr-deadlock); r=jdm Source-Repo: https://github.com/servo/servo Source-Revision: f58c4fda137e7549e67be50c13b26b6319dfb084 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 783a8ba31e1ab693c841d5780867db01ec7d8943 --- servo/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servo/Cargo.lock b/servo/Cargo.lock index b4ada4d2f03e..d4d592a9eda9 100644 --- a/servo/Cargo.lock +++ b/servo/Cargo.lock @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.57.0" -source = "git+https://github.com/servo/webrender#d7735c7da9844775d4a3e6ec8b6cea25fb0b0486" +source = "git+https://github.com/servo/webrender#f461a5b39fe2b35c542303d5f3128a7aff547806" dependencies = [ "app_units 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3403,7 +3403,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.57.0" -source = "git+https://github.com/servo/webrender#d7735c7da9844775d4a3e6ec8b6cea25fb0b0486" +source = "git+https://github.com/servo/webrender#f461a5b39fe2b35c542303d5f3128a7aff547806" dependencies = [ "app_units 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",