diff --git a/components/devtools/actors/source.rs b/components/devtools/actors/source.rs index c0284870cee..122448173b2 100644 --- a/components/devtools/actors/source.rs +++ b/components/devtools/actors/source.rs @@ -86,11 +86,7 @@ impl SourceActor { } } - pub fn new_source( - actors: &mut ActorRegistry, - url: &ServoUrl, - content: String, - ) -> (SourceActor, String) { + pub fn new_source(actors: &mut ActorRegistry, url: &ServoUrl, content: String) -> String { let source_actor_name = actors.new_name("source"); // this can do better, we should find a way to identify content_type @@ -102,8 +98,9 @@ impl SourceActor { .to_string(); let source_actor = SourceActor::new(source_actor_name.clone(), content, content_type); + actors.register(Box::new(source_actor)); - (source_actor, source_actor_name) + source_actor_name } } diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index b0a403fe816..7ed420ba60e 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -514,9 +514,8 @@ impl DevtoolsInstance { fn handle_script_source_info(&mut self, pipeline_id: PipelineId, source_info: SourceInfo) { let mut actors = self.actors.lock().unwrap(); - let (source_actor, source_actor_name) = + let source_actor_name = SourceActor::new_source(&mut actors, &source_info.url, source_info.content.clone()); - actors.register(Box::new(source_actor)); if let Some(worker_id) = source_info.worker_id { let Some(worker_actor_name) = self.actor_workers.get(&worker_id) else { @@ -542,7 +541,7 @@ impl DevtoolsInstance { >>>>>>> 2fbcdac63d6 (fmt) let source = SourceData { - actor: source_actor_name.clone(), + actor: source_actor_name, url: source_info.url.to_string(), is_black_boxed: false, source_content: source_info.content,