diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2015-07-25 00:24:56 -0700 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2015-07-27 09:10:01 -0700 |
commit | 164e10202c48eb96444a6e86990d709213893877 (patch) | |
tree | 12162c311df7f98a259753d4d79ddd8663631128 /components/script/dom/worker.rs | |
parent | e13ebf712de444132a6cc90f394c121d8d751c4c (diff) | |
download | servo-164e10202c48eb96444a6e86990d709213893877.tar.gz servo-164e10202c48eb96444a6e86990d709213893877.zip |
devtools: Convert the developer tools to run over IPC.
Diffstat (limited to 'components/script/dom/worker.rs')
-rw-r--r-- | components/script/dom/worker.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 26fd1ff7421..6a12b6e3571 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -22,10 +22,11 @@ use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; use dom::messageevent::MessageEvent; use script_task::{ScriptChan, ScriptMsg, Runnable}; -use devtools_traits::{DevtoolsControlMsg, DevtoolsPageInfo}; +use devtools_traits::{DevtoolsPageInfo, ScriptToDevtoolsControlMsg}; use util::str::DOMString; +use ipc_channel::ipc; use js::jsapi::{JSContext, HandleValue, RootedValue}; use js::jsapi::{JSAutoRequest, JSAutoCompartment}; use js::jsval::UndefinedValue; @@ -78,16 +79,16 @@ impl Worker { if let Some(ref chan) = global.devtools_chan() { let pipeline_id = global.pipeline(); - let (devtools_sender, _) = channel(); + let (devtools_sender, _) = ipc::channel().unwrap(); let title = format!("Worker for {}", worker_url); let page_info = DevtoolsPageInfo { title: title, url: worker_url.clone(), }; let worker_id = global.get_next_worker_id(); - chan.send( - DevtoolsControlMsg::NewGlobal((pipeline_id, Some(worker_id)), devtools_sender.clone(), page_info) - ).unwrap(); + chan.send(ScriptToDevtoolsControlMsg::NewGlobal((pipeline_id, Some(worker_id)), + devtools_sender.clone(), + page_info)).unwrap(); } DedicatedWorkerGlobalScope::run_worker_scope( |