From ca7bd49567c660551fe7dfd55c6c24afe1a6981c Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Tue, 1 Oct 2019 00:44:15 +0000
Subject: [PATCH] servo: Merge #9299 - cargo-update ipc-channel to get
 important fixes (from antrik:update-ipc_channel); r=pcwalton

This pulls in https://github.com/servo/ipc-channel/pull/25 and
https://github.com/servo/ipc-channel/pull/27, thus fixing fallout from
the multiprocess split, and making Servo work on my system again.

(It also pulls in https://github.com/servo/ipc-channel/pull/12 -- I
guess that's fine?)

Source-Repo: https://github.com/servo/servo
Source-Revision: 42372dbdf112c1c2967c4487401b28e7305c2993

UltraBlame original commit: d16cecf007bc7760538afc4ec593b1d6580648f2
---
 servo/components/servo/Cargo.lock | 2 +-
 servo/ports/cef/Cargo.lock        | 2 +-
 servo/ports/geckolib/Cargo.lock   | 2 +-
 servo/ports/gonk/Cargo.lock       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock
index e70c47faa3ea8..fd25632ae46b3 100644
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@@ -11884,7 +11884,7 @@ ipc
 -
 channel
 #
-1b95d5490d7b7f49576577315bdb5b4c834d08d0
+dfd8513d801d16a7e4a5b0b92a68c27b0dd99fe1
 "
 dependencies
 =
diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock
index 1ba073a7c2644..23aab1e86905c 100644
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@@ -11574,7 +11574,7 @@ ipc
 -
 channel
 #
-1b95d5490d7b7f49576577315bdb5b4c834d08d0
+dfd8513d801d16a7e4a5b0b92a68c27b0dd99fe1
 "
 dependencies
 =
diff --git a/servo/ports/geckolib/Cargo.lock b/servo/ports/geckolib/Cargo.lock
index 644d8e143900a..2d77851d9dbae 100644
--- a/servo/ports/geckolib/Cargo.lock
+++ b/servo/ports/geckolib/Cargo.lock
@@ -2115,7 +2115,7 @@ ipc
 -
 channel
 #
-1b95d5490d7b7f49576577315bdb5b4c834d08d0
+dfd8513d801d16a7e4a5b0b92a68c27b0dd99fe1
 "
 dependencies
 =
diff --git a/servo/ports/gonk/Cargo.lock b/servo/ports/gonk/Cargo.lock
index 41c5c542a8cab..13f537d6d5681 100644
--- a/servo/ports/gonk/Cargo.lock
+++ b/servo/ports/gonk/Cargo.lock
@@ -11006,7 +11006,7 @@ ipc
 -
 channel
 #
-1b95d5490d7b7f49576577315bdb5b4c834d08d0
+dfd8513d801d16a7e4a5b0b92a68c27b0dd99fe1
 "
 dependencies
 =