diff options
author | Corey Farwell <coreyf@rwell.org> | 2016-12-08 08:43:52 -1000 |
---|---|---|
committer | Corey Farwell <coreyf@rwell.org> | 2016-12-08 08:50:35 -1000 |
commit | 449f6337d4d42dcc93c015e63bba80068a109513 (patch) | |
tree | 6d1808c4d56f542a89754d514e86e85858655688 /components/script/dom/abstractworkerglobalscope.rs | |
parent | 0fe94a6724a42da8f02a60d1efe18fdfc96885ae (diff) | |
download | servo-449f6337d4d42dcc93c015e63bba80068a109513.tar.gz servo-449f6337d4d42dcc93c015e63bba80068a109513.zip |
Rename `Reflectable` to `DomObject`.
Fixes https://github.com/servo/servo/issues/8473.
Diffstat (limited to 'components/script/dom/abstractworkerglobalscope.rs')
-rw-r--r-- | components/script/dom/abstractworkerglobalscope.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/abstractworkerglobalscope.rs b/components/script/dom/abstractworkerglobalscope.rs index dc4bf15c89e..7c79a919165 100644 --- a/components/script/dom/abstractworkerglobalscope.rs +++ b/components/script/dom/abstractworkerglobalscope.rs @@ -4,7 +4,7 @@ use dom::abstractworker::WorkerScriptMsg; use dom::bindings::refcounted::Trusted; -use dom::bindings::reflector::Reflectable; +use dom::bindings::reflector::DomObject; use dom::bindings::trace::JSTraceable; use script_runtime::{ScriptChan, CommonScriptMsg, ScriptPort}; use std::sync::mpsc::{Receiver, Sender}; @@ -13,12 +13,12 @@ use std::sync::mpsc::{Receiver, Sender}; /// common event loop messages. While this SendableWorkerScriptChan is alive, the associated /// Worker object will remain alive. #[derive(JSTraceable, Clone)] -pub struct SendableWorkerScriptChan<T: Reflectable> { +pub struct SendableWorkerScriptChan<T: DomObject> { pub sender: Sender<(Trusted<T>, CommonScriptMsg)>, pub worker: Trusted<T>, } -impl<T: JSTraceable + Reflectable + 'static> ScriptChan for SendableWorkerScriptChan<T> { +impl<T: JSTraceable + DomObject + 'static> ScriptChan for SendableWorkerScriptChan<T> { fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> { self.sender.send((self.worker.clone(), msg)).map_err(|_| ()) } @@ -35,12 +35,12 @@ impl<T: JSTraceable + Reflectable + 'static> ScriptChan for SendableWorkerScript /// worker event loop messages. While this SendableWorkerScriptChan is alive, the associated /// Worker object will remain alive. #[derive(JSTraceable, Clone)] -pub struct WorkerThreadWorkerChan<T: Reflectable> { +pub struct WorkerThreadWorkerChan<T: DomObject> { pub sender: Sender<(Trusted<T>, WorkerScriptMsg)>, pub worker: Trusted<T>, } -impl<T: JSTraceable + Reflectable + 'static> ScriptChan for WorkerThreadWorkerChan<T> { +impl<T: JSTraceable + DomObject + 'static> ScriptChan for WorkerThreadWorkerChan<T> { fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> { self.sender .send((self.worker.clone(), WorkerScriptMsg::Common(msg))) @@ -55,7 +55,7 @@ impl<T: JSTraceable + Reflectable + 'static> ScriptChan for WorkerThreadWorkerCh } } -impl<T: Reflectable> ScriptPort for Receiver<(Trusted<T>, WorkerScriptMsg)> { +impl<T: DomObject> ScriptPort for Receiver<(Trusted<T>, WorkerScriptMsg)> { fn recv(&self) -> Result<CommonScriptMsg, ()> { match self.recv().map(|(_, msg)| msg) { Ok(WorkerScriptMsg::Common(script_msg)) => Ok(script_msg), |