diff options
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.toml | 4 | ||||
| -rw-r--r-- | components/servo/lib.rs | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 34a75fa4292..423d6814810 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -32,6 +32,7 @@ canvas = {path = "../canvas"} canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing", features = ["gleam"]} constellation = {path = "../constellation"} +crossbeam-channel = "0.2" debugger = {path = "../debugger"} devtools = {path = "../devtools"} devtools_traits = {path = "../devtools_traits"} @@ -40,7 +41,7 @@ env_logger = "0.5" euclid = "0.19" gfx = {path = "../gfx"} gleam = "0.6" -ipc-channel = "0.10" +ipc-channel = "0.11" layout_thread = {path = "../layout_thread"} log = "0.4" msg = {path = "../msg"} @@ -51,6 +52,7 @@ profile_traits = {path = "../profile_traits"} script = {path = "../script"} script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} +servo_channel = {path = "../channel"} servo_config = {path = "../config"} servo_geometry = {path = "../geometry"} servo_url = {path = "../url"} diff --git a/components/servo/lib.rs b/components/servo/lib.rs index f6edcc45bde..dba8ce702df 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -46,6 +46,7 @@ pub extern crate profile_traits; pub extern crate script; pub extern crate script_traits; pub extern crate script_layout_interface; +pub extern crate servo_channel; pub extern crate servo_config; pub extern crate servo_geometry; pub extern crate servo_url; @@ -95,13 +96,13 @@ use profile::time as profile_time; use profile_traits::mem; use profile_traits::time; use script_traits::{ConstellationMsg, SWManagerSenders, ScriptToConstellationChan}; +use servo_channel::{Sender, channel}; use servo_config::opts; use servo_config::prefs::PREFS; use std::borrow::Cow; use std::cmp::max; use std::path::PathBuf; use std::rc::Rc; -use std::sync::mpsc::{Sender, channel}; use webrender::RendererKind; use webvr::{WebVRThread, WebVRCompositorHandler}; @@ -275,7 +276,7 @@ where WindowEvent::LoadUrl(top_level_browsing_context_id, url) => { let msg = ConstellationMsg::LoadUrl(top_level_browsing_context_id, url); if let Err(e) = self.constellation_chan.send(msg) { - warn!("Sending load url to constellation failed ({}).", e); + warn!("Sending load url to constellation failed ({:?}).", e); } }, @@ -313,14 +314,14 @@ where let msg = ConstellationMsg::TraverseHistory(top_level_browsing_context_id, direction); if let Err(e) = self.constellation_chan.send(msg) { - warn!("Sending navigation to constellation failed ({}).", e); + warn!("Sending navigation to constellation failed ({:?}).", e); } }, WindowEvent::KeyEvent(ch, key, state, modifiers) => { let msg = ConstellationMsg::KeyEvent(ch, key, state, modifiers); if let Err(e) = self.constellation_chan.send(msg) { - warn!("Sending key event to constellation failed ({}).", e); + warn!("Sending key event to constellation failed ({:?}).", e); } }, @@ -331,7 +332,7 @@ where WindowEvent::Reload(top_level_browsing_context_id) => { let msg = ConstellationMsg::Reload(top_level_browsing_context_id); if let Err(e) = self.constellation_chan.send(msg) { - warn!("Sending reload to constellation failed ({}).", e); + warn!("Sending reload to constellation failed ({:?}).", e); } }, @@ -347,7 +348,7 @@ where let msg = ConstellationMsg::NewBrowser(url, browser_id); if let Err(e) = self.constellation_chan.send(msg) { warn!( - "Sending NewBrowser message to constellation failed ({}).", + "Sending NewBrowser message to constellation failed ({:?}).", e ); } @@ -357,7 +358,7 @@ where let msg = ConstellationMsg::SelectBrowser(ctx); if let Err(e) = self.constellation_chan.send(msg) { warn!( - "Sending SelectBrowser message to constellation failed ({}).", + "Sending SelectBrowser message to constellation failed ({:?}).", e ); } @@ -367,7 +368,7 @@ where let msg = ConstellationMsg::CloseBrowser(ctx); if let Err(e) = self.constellation_chan.send(msg) { warn!( - "Sending CloseBrowser message to constellation failed ({}).", + "Sending CloseBrowser message to constellation failed ({:?}).", e ); } @@ -376,7 +377,7 @@ where WindowEvent::SendError(ctx, e) => { let msg = ConstellationMsg::SendError(ctx, e); if let Err(e) = self.constellation_chan.send(msg) { - warn!("Sending SendError message to constellation failed ({}).", e); + warn!("Sending SendError message to constellation failed ({:?}).", e); } }, } |