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

Make dom::blob::read_file take a &GlobalScope

Browse source
This commit is contained in:
Anthony Ramine 2016-10-03 18:43:02 +02:00
parent bad49e4696
commit 9a48ebb245
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/blob.rs
View file

@ -144,8 +144,7 @@ impl Blob {
let (buffer, is_new_buffer) = match *f.cache.borrow() { let (buffer, is_new_buffer) = match *f.cache.borrow() {
Some(ref bytes) => (bytes.clone(), false), Some(ref bytes) => (bytes.clone(), false),
None => { None => {
let global = self.global(); let bytes = read_file(&self.global_scope(), f.id.clone())?;
let bytes = read_file(global.r(), f.id.clone())?;
(bytes, true) (bytes, true)
} }
}; };
@ -304,10 +303,10 @@ impl Drop for Blob {
} }
} }
fn read_file(global: GlobalRef, id: Uuid) -> Result<Vec<u8>, ()> { fn read_file(global: &GlobalScope, id: Uuid) -> Result<Vec<u8>, ()> {
let resource_threads = global.as_global_scope().resource_threads(); let resource_threads = global.resource_threads();
let (chan, recv) = ipc::channel().map_err(|_|())?; let (chan, recv) = ipc::channel().map_err(|_|())?;
let origin = get_blob_origin(&global.as_global_scope().get_url()); let origin = get_blob_origin(&global.get_url());
let check_url_validity = false; let check_url_validity = false;
let msg = FileManagerThreadMsg::ReadFile(chan, id, check_url_validity, origin); let msg = FileManagerThreadMsg::ReadFile(chan, id, check_url_validity, origin);
let _ = resource_threads.send(CoreResourceMsg::ToFileManager(msg)); let _ = resource_threads.send(CoreResourceMsg::ToFileManager(msg));