diff options
| -rw-r--r-- | components/net/filemanager_thread.rs | 16 | ||||
| -rw-r--r-- | tests/unit/net/fetch.rs | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs index e965cff1a0b..03aaa22eb38 100644 --- a/components/net/filemanager_thread.rs +++ b/components/net/filemanager_thread.rs @@ -150,6 +150,17 @@ impl<UI: 'static + UIProvider> FileManager<UI> { }) } + pub fn promote_memory(&self, + blob_buf: BlobBuf, + set_valid: bool, + sender: IpcSender<Result<Uuid, BlobURLStoreError>>, + origin: FileOrigin) { + let store = self.store.clone(); + spawn_named("transfer memory".to_owned(), move || { + store.promote_memory(blob_buf, set_valid, sender, origin); + }) + } + /// Message handler pub fn handle(&self, msg: FileManagerThreadMsg, cancel_listener: Option<CancellationListener>) { match msg { @@ -171,10 +182,7 @@ impl<UI: 'static + UIProvider> FileManager<UI> { self.read_file(sender, id, check_url_validity, origin, cancel_listener); } FileManagerThreadMsg::PromoteMemory(blob_buf, set_valid, sender, origin) => { - let store = self.store.clone(); - spawn_named("transfer memory".to_owned(), move || { - store.promote_memory(blob_buf, set_valid, sender, origin); - }) + self.promote_memory(blob_buf, set_valid, sender, origin); } FileManagerThreadMsg::AddSlicedURLEntry(id, rel_pos, sender, origin) =>{ self.store.add_sliced_url_entry(id, rel_pos, sender, origin); diff --git a/tests/unit/net/fetch.rs b/tests/unit/net/fetch.rs index 2b973b6f774..be1878667a4 100644 --- a/tests/unit/net/fetch.rs +++ b/tests/unit/net/fetch.rs @@ -98,7 +98,6 @@ fn test_fetch_aboutblank() { fn test_fetch_blob() { use ipc_channel::ipc; use net_traits::blob_url_store::BlobBuf; - use net_traits::filemanager_thread::FileManagerThreadMsg; let context = new_fetch_context(None); @@ -113,8 +112,7 @@ fn test_fetch_blob() { let origin = ServoUrl::parse("http://www.example.org/").unwrap(); let (sender, receiver) = ipc::channel().unwrap(); - let message = FileManagerThreadMsg::PromoteMemory(blob_buf, true, sender, "http://www.example.org".into()); - context.filemanager.handle(message, None); + context.filemanager.promote_memory(blob_buf, true, sender, "http://www.example.org".into()); let id = receiver.recv().unwrap().unwrap(); let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.simple())).unwrap(); |