aboutsummaryrefslogtreecommitdiffstats
path: root/components/net
diff options
context:
space:
mode:
Diffstat (limited to 'components/net')
-rw-r--r--components/net/Cargo.toml2
-rw-r--r--components/net/blob_loader.rs3
-rw-r--r--components/net/filemanager_thread.rs87
3 files changed, 36 insertions, 56 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index c87485feedd..c2e1dee90b9 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -39,7 +39,7 @@ time = "0.1.17"
unicase = "1.4.0"
url = {version = "1.2", features = ["heap_size", "rustc-serialize"]}
util = {path = "../util"}
-uuid = {version = "0.3", features = ["v4"]}
+uuid = {version = "0.3.1", features = ["v4"]}
websocket = "0.17"
[dependencies.webrender_traits]
diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs
index 0c9e858be36..5cad922802a 100644
--- a/components/net/blob_loader.rs
+++ b/components/net/blob_loader.rs
@@ -12,7 +12,7 @@ use mime::{Mime, Attr};
use mime_classifier::MimeClassifier;
use net_traits::ProgressMsg::{Payload, Done};
use net_traits::blob_url_store::parse_blob_url;
-use net_traits::filemanager_thread::{FileManagerThreadMsg, SelectedFileId, ReadFileProgress};
+use net_traits::filemanager_thread::{FileManagerThreadMsg, ReadFileProgress};
use net_traits::response::HttpsState;
use net_traits::{LoadConsumer, LoadData, Metadata, NetworkError};
use resource_thread::CancellationListener;
@@ -40,7 +40,6 @@ fn load_blob<UI: 'static + UIProvider>
cancel_listener: CancellationListener) {
let (chan, recv) = ipc::channel().unwrap();
if let Ok((id, origin, _fragment)) = parse_blob_url(&load_data.url.clone()) {
- let id = SelectedFileId(id.simple().to_string());
let check_url_validity = true;
let msg = FileManagerThreadMsg::ReadFile(chan, id, check_url_validity, origin);
let _ = filemanager.handle(msg, Some(cancel_listener));
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index 4bfa44e8736..8e224d313b2 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -6,8 +6,7 @@ use ipc_channel::ipc::IpcSender;
use mime_guess::guess_mime_type_opt;
use net_traits::blob_url_store::{BlobBuf, BlobURLStoreError};
use net_traits::filemanager_thread::{FileManagerThreadMsg, FileManagerResult, FilterPattern, FileOrigin};
-use net_traits::filemanager_thread::{SelectedFile, RelativePos, FileManagerThreadError};
-use net_traits::filemanager_thread::{SelectedFileId, ReadFileProgress};
+use net_traits::filemanager_thread::{SelectedFile, RelativePos, FileManagerThreadError, ReadFileProgress};
use resource_thread::CancellationListener;
use std::collections::HashMap;
use std::fs::File;
@@ -157,31 +156,19 @@ impl<UI: 'static + UIProvider> FileManager<UI> {
})
}
FileManagerThreadMsg::DecRef(id, origin, sender) => {
- if let Ok(id) = Uuid::parse_str(&id.0) {
- spawn_named("dec ref".to_owned(), move || {
- let _ = sender.send(store.dec_ref(&id, &origin));
- })
- } else {
- let _ = sender.send(Err(BlobURLStoreError::InvalidFileID));
- }
+ spawn_named("dec ref".to_owned(), move || {
+ let _ = sender.send(store.dec_ref(&id, &origin));
+ })
}
FileManagerThreadMsg::RevokeBlobURL(id, origin, sender) => {
- if let Ok(id) = Uuid::parse_str(&id.0) {
- spawn_named("revoke blob url".to_owned(), move || {
- let _ = sender.send(store.set_blob_url_validity(false, &id, &origin));
- })
- } else {
- let _ = sender.send(Err(BlobURLStoreError::InvalidFileID));
- }
+ spawn_named("revoke blob url".to_owned(), move || {
+ let _ = sender.send(store.set_blob_url_validity(false, &id, &origin));
+ })
}
FileManagerThreadMsg::ActivateBlobURL(id, sender, origin) => {
- if let Ok(id) = Uuid::parse_str(&id.0) {
- spawn_named("activate blob url".to_owned(), move || {
- let _ = sender.send(store.set_blob_url_validity(true, &id, &origin));
- });
- } else {
- let _ = sender.send(Err(BlobURLStoreError::InvalidFileID));
- }
+ spawn_named("activate blob url".to_owned(), move || {
+ let _ = sender.send(store.set_blob_url_validity(true, &id, &origin));
+ });
}
}
}
@@ -245,31 +232,27 @@ impl <UI: 'static + UIProvider> FileManagerStore<UI> {
}
}
- fn add_sliced_url_entry(&self, parent_id: SelectedFileId, rel_pos: RelativePos,
- sender: IpcSender<Result<SelectedFileId, BlobURLStoreError>>,
+ fn add_sliced_url_entry(&self, parent_id: Uuid, rel_pos: RelativePos,
+ sender: IpcSender<Result<Uuid, BlobURLStoreError>>,
origin_in: FileOrigin) {
- if let Ok(parent_id) = Uuid::parse_str(&parent_id.0) {
- match self.inc_ref(&parent_id, &origin_in) {
- Ok(_) => {
- let new_id = Uuid::new_v4();
- self.insert(new_id, FileStoreEntry {
- origin: origin_in,
- file_impl: FileImpl::Sliced(parent_id, rel_pos),
- refs: AtomicUsize::new(1),
- // Valid here since AddSlicedURLEntry implies URL creation
- // from a BlobImpl::Sliced
- is_valid_url: AtomicBool::new(true),
- });
-
- // We assume that the returned id will be held by BlobImpl::File
- let _ = sender.send(Ok(SelectedFileId(new_id.simple().to_string())));
- }
- Err(e) => {
- let _ = sender.send(Err(e));
- }
+ match self.inc_ref(&parent_id, &origin_in) {
+ Ok(_) => {
+ let new_id = Uuid::new_v4();
+ self.insert(new_id, FileStoreEntry {
+ origin: origin_in,
+ file_impl: FileImpl::Sliced(parent_id, rel_pos),
+ refs: AtomicUsize::new(1),
+ // Valid here since AddSlicedURLEntry implies URL creation
+ // from a BlobImpl::Sliced
+ is_valid_url: AtomicBool::new(true),
+ });
+
+ // We assume that the returned id will be held by BlobImpl::File
+ let _ = sender.send(Ok(new_id));
+ }
+ Err(e) => {
+ let _ = sender.send(Err(e));
}
- } else {
- let _ = sender.send(Err(BlobURLStoreError::InvalidFileID));
}
}
@@ -374,7 +357,7 @@ impl <UI: 'static + UIProvider> FileManagerStore<UI> {
};
Ok(SelectedFile {
- id: SelectedFileId(id.simple().to_string()),
+ id: id,
filename: filename_path.to_path_buf(),
modified: modified_epoch,
size: file_size,
@@ -446,11 +429,9 @@ impl <UI: 'static + UIProvider> FileManagerStore<UI> {
// Convenient wrapper over get_blob_buf
fn try_read_file(&self, sender: IpcSender<FileManagerResult<ReadFileProgress>>,
- id: SelectedFileId, check_url_validity: bool, origin_in: FileOrigin,
+ id: Uuid, check_url_validity: bool, origin_in: FileOrigin,
cancel_listener: Option<CancellationListener>) -> Result<(), BlobURLStoreError> {
- let id = try!(Uuid::parse_str(&id.0).map_err(|_| BlobURLStoreError::InvalidFileID));
- self.get_blob_buf(sender, &id, &origin_in, RelativePos::full_range(),
- check_url_validity, cancel_listener)
+ self.get_blob_buf(sender, &id, &origin_in, RelativePos::full_range(), check_url_validity, cancel_listener)
}
fn dec_ref(&self, id: &Uuid, origin_in: &FileOrigin) -> Result<(), BlobURLStoreError> {
@@ -494,7 +475,7 @@ impl <UI: 'static + UIProvider> FileManagerStore<UI> {
}
fn promote_memory(&self, blob_buf: BlobBuf, set_valid: bool,
- sender: IpcSender<Result<SelectedFileId, BlobURLStoreError>>, origin: FileOrigin) {
+ sender: IpcSender<Result<Uuid, BlobURLStoreError>>, origin: FileOrigin) {
match Url::parse(&origin) { // parse to check sanity
Ok(_) => {
let id = Uuid::new_v4();
@@ -505,7 +486,7 @@ impl <UI: 'static + UIProvider> FileManagerStore<UI> {
is_valid_url: AtomicBool::new(set_valid),
});
- let _ = sender.send(Ok(SelectedFileId(id.simple().to_string())));
+ let _ = sender.send(Ok(id));
}
Err(_) => {
let _ = sender.send(Err(BlobURLStoreError::InvalidOrigin));
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 15:02:59 +0000