aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout_traits
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-12-17 23:53:32 +0100
committerGregory Terzian <gterzian@users.noreply.github.com>2018-09-12 13:33:32 +0800
commit2a996fbc8fef722b264389680cc55c25c46807d1 (patch)
tree22c19321899cf4b35384c8c8e186f1a0bf7913c8 /components/layout_traits
parentb977b4994c678ce1d9bca69be72d095522c25f71 (diff)
downloadservo-2a996fbc8fef722b264389680cc55c25c46807d1.tar.gz
servo-2a996fbc8fef722b264389680cc55c25c46807d1.zip
Replace mpsc with crossbeam/servo channel, update ipc-channel
Co-authored-by: Gregory Terzian <gterzian@users.noreply.github.com>
Diffstat (limited to 'components/layout_traits')
-rw-r--r--components/layout_traits/Cargo.toml3
-rw-r--r--components/layout_traits/lib.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml
index 38c53836bd9..162c7add7b4 100644
--- a/components/layout_traits/Cargo.toml
+++ b/components/layout_traits/Cargo.toml
@@ -11,11 +11,12 @@ path = "lib.rs"
[dependencies]
gfx = {path = "../gfx"}
-ipc-channel = "0.10"
+ipc-channel = "0.11"
metrics = {path = "../metrics"}
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
profile_traits = {path = "../profile_traits"}
script_traits = {path = "../script_traits"}
+servo_channel = {path = "../channel"}
servo_url = {path = "../url"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs
index 6566065e421..646706e7717 100644
--- a/components/layout_traits/lib.rs
+++ b/components/layout_traits/lib.rs
@@ -11,6 +11,7 @@ extern crate msg;
extern crate net_traits;
extern crate profile_traits;
extern crate script_traits;
+extern crate servo_channel;
extern crate servo_url;
extern crate webrender_api;
@@ -28,9 +29,9 @@ use net_traits::image_cache::ImageCache;
use profile_traits::{mem, time};
use script_traits::{ConstellationControlMsg, LayoutControlMsg};
use script_traits::LayoutMsg as ConstellationMsg;
+use servo_channel::{Receiver, Sender};
use servo_url::ServoUrl;
use std::sync::Arc;
-use std::sync::mpsc::{Receiver, Sender};
// A static method creating a layout thread
// Here to remove the compositor -> layout dependency