Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10873 - izgzhen:blob, r=Manishearth

Browse source 
Fixes related to File API

Fixing problems I met when trying to resolve https://github.com/servo/servo/issues/10851, but most of changes here are simple fixes.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10873)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-01 22:13:20 -07:00
commit 14926529c9
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,10 @@ impl DataSlice {
&self.bytes[self.bytes_start..self.bytes_end]
}
pub fn get_all_bytes(&self) -> Arc<Vec<u8>> {
self.bytes.clone()
}
pub fn size(&self) -> u64 {
(self.bytes_end as u64) - (self.bytes_start as u64)
}

11
components/script/dom/file.rs
View file

@ -18,14 +18,15 @@ pub struct File {
}
impl File {
fn new_inherited(_file_bits: &Blob, name: DOMString) -> File {
fn new_inherited(file_bits: &Blob, name: DOMString) -> File {
// TODO: FilePropertyBag
let mut bytes = Vec::new();
bytes.extend_from_slice(file_bits.get_data().get_all_bytes().as_slice());
File {
//TODO: get type from the underlying filesystem instead of "".to_string()
blob: Blob::new_inherited(Arc::new(Vec::new()), None, None, ""),
blob: Blob::new_inherited(Arc::new(bytes), None, None, ""),
name: name,
}
// XXXManishearth Once Blob is able to store data
// the relevant subfields of file_bits should be copied over
}
pub fn new(global: GlobalRef, file_bits: &Blob, name: DOMString) -> Root<File> {

6
components/script/dom/filelist.rs
View file

@ -40,7 +40,11 @@ impl FileListMethods for FileList {
// https://w3c.github.io/FileAPI/#dfn-item
fn Item(&self, index: u32) -> Option<Root<File>> {
Some(Root::from_ref(&*(self.list[index as usize])))
if (index as usize) < self.list.len() {
Some(Root::from_ref(&*(self.list[index as usize])))
} else {
None
}
}
// check-tidy: no specs after this line