diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2017-12-17 23:53:32 +0100 |
---|---|---|
committer | Gregory Terzian <gterzian@users.noreply.github.com> | 2018-09-12 13:33:32 +0800 |
commit | 2a996fbc8fef722b264389680cc55c25c46807d1 (patch) | |
tree | 22c19321899cf4b35384c8c8e186f1a0bf7913c8 /components/compositing/compositor_thread.rs | |
parent | b977b4994c678ce1d9bca69be72d095522c25f71 (diff) | |
download | servo-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/compositing/compositor_thread.rs')
-rw-r--r-- | components/compositing/compositor_thread.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/compositing/compositor_thread.rs b/components/compositing/compositor_thread.rs index 9ea2f73ab35..c0a0169cdcd 100644 --- a/components/compositing/compositor_thread.rs +++ b/components/compositing/compositor_thread.rs @@ -14,8 +14,8 @@ use net_traits::image::base::Image; use profile_traits::mem; use profile_traits::time; use script_traits::{AnimationState, ConstellationMsg, EventResult}; +use servo_channel::{Receiver, Sender}; use std::fmt::{Debug, Error, Formatter}; -use std::sync::mpsc::{Receiver, Sender}; use style_traits::viewport::ViewportConstraints; use webrender; use webrender_api::{self, DeviceIntPoint, DeviceUintSize}; @@ -28,9 +28,8 @@ pub struct CompositorProxy { impl CompositorProxy { pub fn send(&self, msg: Msg) { - // Send a message and kick the OS event loop awake. if let Err(err) = self.sender.send(msg) { - warn!("Failed to send response ({}).", err); + warn!("Failed to send response ({:?}).", err); } self.event_loop_waker.wake(); } @@ -52,7 +51,7 @@ pub struct CompositorReceiver { impl CompositorReceiver { pub fn try_recv_compositor_msg(&mut self) -> Option<Msg> { - self.receiver.try_recv().ok() + self.receiver.try_recv() } pub fn recv_compositor_msg(&mut self) -> Msg { self.receiver.recv().unwrap() |