diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-04-21 08:05:48 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-04-21 08:05:48 -0500 |
commit | fe61cdc95da968c21bc15d01cdb16e470f67c492 (patch) | |
tree | c640fd8a74700c55ffdd02f670276e39fc466526 | |
parent | e4b620ea54c94e03095e4108bce94ec750416bba (diff) | |
parent | d0138443d5ccc577b72ff8630ae8f2c7526db317 (diff) | |
download | servo-fe61cdc95da968c21bc15d01cdb16e470f67c492.tar.gz servo-fe61cdc95da968c21bc15d01cdb16e470f67c492.zip |
Auto merge of #5758 - dhananjay92:Issue#5735, r=jdm
Solves #5735.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5758)
<!-- Reviewable:end -->
-rw-r--r-- | components/devtools/lib.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 90e9718728a..e2d06a7665b 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -114,6 +114,8 @@ fn run_server(sender: Sender<DevtoolsControlMsg>, let mut actor_pipelines: HashMap<PipelineId, String> = HashMap::new(); + let mut actor_workers: HashMap<(PipelineId, WorkerId), String> = HashMap::new(); + /// Process the input from a single devtools client until EOF. fn handle_client(actors: Arc<Mutex<ActorRegistry>>, mut stream: TcpStream) { @@ -152,13 +154,12 @@ fn run_server(sender: Sender<DevtoolsControlMsg>, ids: (PipelineId, Option<WorkerId>), scriptSender: Sender<DevtoolScriptControlMsg>, actor_pipelines: &mut HashMap<PipelineId, String>, + actor_workers: &mut HashMap<(PipelineId, WorkerId), String>, page_info: DevtoolsPageInfo) { let mut actors = actors.lock().unwrap(); let (pipeline, worker_id) = ids; - let mut actor_workers: HashMap<(PipelineId, WorkerId), String> = HashMap::new(); - //TODO: move all this actor creation into a constructor method on TabActor let (tab, console, inspector, timeline) = { let console = ConsoleActor { @@ -269,7 +270,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>, Ok(DevtoolsControlMsg::ServerExitMsg) | Err(RecvError) => break, Ok(DevtoolsControlMsg::NewGlobal(ids, scriptSender, pageinfo)) => handle_new_global(actors.clone(), ids, scriptSender, &mut actor_pipelines, - pageinfo), + &mut actor_workers, pageinfo), Ok(DevtoolsControlMsg::SendConsoleMessage(id, console_message)) => handle_console_message(actors.clone(), id, console_message, &actor_pipelines), |