diff options
author | Zhen Zhang <izgzhen@gmail.com> | 2016-07-05 16:42:07 +0800 |
---|---|---|
committer | Zhen Zhang <izgzhen@gmail.com> | 2016-07-05 17:51:53 +0800 |
commit | ab14777312b6bc0e21736f907bc22364dea143d3 (patch) | |
tree | 9cd66fac8556e87da7b483785a8c8a27de1527ec /components/net/filemanager_thread.rs | |
parent | 1cba3b3e9835fffbae91ab9dac76ed1f75bcf5c7 (diff) | |
download | servo-ab14777312b6bc0e21736f907bc22364dea143d3.tar.gz servo-ab14777312b6bc0e21736f907bc22364dea143d3.zip |
Remove DataSlice, fix #12249
Diffstat (limited to 'components/net/filemanager_thread.rs')
-rw-r--r-- | components/net/filemanager_thread.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs index 469cd36c3a7..2a32bc91040 100644 --- a/components/net/filemanager_thread.rs +++ b/components/net/filemanager_thread.rs @@ -135,8 +135,8 @@ impl<UI: 'static + UIProvider> FileManager<UI> { Err(_) => { let _ = sender.send(Err(FileManagerThreadError::ReadFileError)); } } } - FileManagerThreadMsg::TransferMemory(entry, rel_pos, sender, origin) => - self.transfer_memory(entry, rel_pos, sender, origin), + FileManagerThreadMsg::TransferMemory(entry, sender, origin) => + self.transfer_memory(entry, sender, origin), FileManagerThreadMsg::AddSlicedEntry(id, rel_pos, sender, origin) => self.add_sliced_entry(id, rel_pos, sender, origin), FileManagerThreadMsg::LoadBlob(load_data, consumer) => { @@ -418,8 +418,9 @@ impl<UI: 'static + UIProvider> FileManager<UI> { } } - fn transfer_memory(&mut self, entry: BlobURLStoreEntry, rel_pos: RelativePos, - sender: IpcSender<Result<SelectedFileId, BlobURLStoreError>>, origin: FileOrigin) { + fn transfer_memory(&mut self, entry: BlobURLStoreEntry, + sender: IpcSender<Result<SelectedFileId, BlobURLStoreError>>, + origin: FileOrigin) { match Url::parse(&origin) { // parse to check sanity Ok(_) => { let id = Uuid::new_v4(); @@ -428,9 +429,8 @@ impl<UI: 'static + UIProvider> FileManager<UI> { file_impl: FileImpl::Memory(entry), refs: Cell::new(1), }); - let sliced_id = SelectedFileId(id.simple().to_string()); - self.add_sliced_entry(sliced_id, rel_pos, sender, origin); + let _ = sender.send(Ok(SelectedFileId(id.simple().to_string()))); } Err(_) => { let _ = sender.send(Err(BlobURLStoreError::InvalidOrigin)); |