Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix 6058: --devtools panics if there is no console actor

Browse source
This commit is contained in:
Alexander Putilin 2015-05-26 23:51:07 +03:00 • committed by Josh Matthews
parent be9d60664d
commit f04779f398
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/devtools/lib.rs
View file

@ -250,7 +250,10 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
id: PipelineId, id: PipelineId,
console_message: ConsoleMessage, console_message: ConsoleMessage,
actor_pipelines: &HashMap<PipelineId, String>) { actor_pipelines: &HashMap<PipelineId, String>) {
let console_actor_name = find_console_actor(actors.clone(), id, actor_pipelines); let console_actor_name = match find_console_actor(actors.clone(), id, actor_pipelines) {
Some(name) => name,
None => return,
};
let actors = actors.lock().unwrap(); let actors = actors.lock().unwrap();
let console_actor = actors.find::<ConsoleActor>(&console_actor_name); let console_actor = actors.find::<ConsoleActor>(&console_actor_name);
let msg = ConsoleAPICall { let msg = ConsoleAPICall {
@ -278,12 +281,15 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
fn find_console_actor(actors: Arc<Mutex<ActorRegistry>>, fn find_console_actor(actors: Arc<Mutex<ActorRegistry>>,
id: PipelineId, id: PipelineId,
actor_pipelines: &HashMap<PipelineId, String>) -> String { actor_pipelines: &HashMap<PipelineId, String>) -> Option<String> {
let actors = actors.lock().unwrap(); let actors = actors.lock().unwrap();
let ref tab_actor_name = (*actor_pipelines)[&id]; let tab_actor_name = match (*actor_pipelines).get(&id) {
Some(name) => name,
None => return None,
};
let tab_actor = actors.find::<TabActor>(tab_actor_name); let tab_actor = actors.find::<TabActor>(tab_actor_name);
let console_actor_name = tab_actor.console.clone(); let console_actor_name = tab_actor.console.clone();
return console_actor_name; return Some(console_actor_name);
} }
fn handle_network_event(actors: Arc<Mutex<ActorRegistry>>, fn handle_network_event(actors: Arc<Mutex<ActorRegistry>>,
@ -294,7 +300,11 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
request_id: String, request_id: String,
network_event: NetworkEvent) { network_event: NetworkEvent) {
let console_actor_name = find_console_actor(actors.clone(), pipeline_id, actor_pipelines); let console_actor_name = match find_console_actor(actors.clone(), pipeline_id,
actor_pipelines) {
Some(name) => name,
None => return,
};
let netevent_actor_name = find_network_event_actor(actors.clone(), actor_requests, request_id.clone()); let netevent_actor_name = find_network_event_actor(actors.clone(), actor_requests, request_id.clone());
let mut actors = actors.lock().unwrap(); let mut actors = actors.lock().unwrap();
let actor = actors.find_mut::<NetworkEventActor>(&netevent_actor_name); let actor = actors.find_mut::<NetworkEventActor>(&netevent_actor_name);