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

Auto merge of #10795 - yoava333:master, r=Ms2ger

Browse source 
updated Blob constructor to use optional

fixes https://github.com/servo/servo/issues/10779

<!-- 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/10795)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-22 23:17:55 -07:00
commit 1b13ddcd8a
3 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,29 +117,28 @@ impl Blob {
}
// https://w3c.github.io/FileAPI/#constructorBlob
pub fn Constructor(global: GlobalRef) -> Fallible<Root<Blob>> {
Ok(Blob::new(global, Vec::new(), ""))
}
// https://w3c.github.io/FileAPI/#constructorBlob
pub fn Constructor_(global: GlobalRef,
blobParts: Vec<BlobOrString>,
blobPropertyBag: &BlobBinding::BlobPropertyBag)
-> Fallible<Root<Blob>> {
pub fn Constructor(global: GlobalRef,
blobParts: Option<Vec<BlobOrString>>,
blobPropertyBag: &BlobBinding::BlobPropertyBag)
-> Fallible<Root<Blob>> {
// TODO: accept other blobParts types - ArrayBuffer or ArrayBufferView
let bytes: Vec<u8> = blobParts.iter()
.flat_map(|bPart| {
match bPart {
&BlobOrString::String(ref s) => {
UTF_8.encode(s, EncoderTrap::Replace).unwrap()
},
&BlobOrString::Blob(ref b) => {
b.get_data().get_bytes().to_vec()
},
}
})
.collect();
let bytes: Vec<u8> = match blobParts {
None => Vec::new(),
Some(blobs) => {
blobs.iter().flat_map(|bPart| {
match bPart {
&BlobOrString::String(ref s) => {
UTF_8.encode(s, EncoderTrap::Replace).unwrap()
},
&BlobOrString::Blob(ref b) => {
b.get_data().get_bytes().to_vec()
},
}
})
.collect()
}
};
let typeString = if is_ascii_printable(&blobPropertyBag.type_) {
&*blobPropertyBag.type_
} else {

3
components/script/dom/webidls/Blob.webidl
View file

@ -3,8 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// http://dev.w3.org/2006/webapi/FileAPI/#dfn-Blob
[Constructor,
Constructor(sequence<(/*ArrayBuffer or ArrayBufferView or */Blob or DOMString)> blobParts,
[Constructor(optional sequence<(/*ArrayBuffer or ArrayBufferView or */Blob or DOMString)> blobParts,
optional BlobPropertyBag options),
Exposed=Window/*,Worker*/]
interface Blob {

4
tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini
View file

@ -46,7 +46,3 @@
bug: https://github.com/servo/servo/issues/10744
expected: FAIL
[Blob constructor with undefined as first argument]
bug: https://github.com/servo/servo/issues/10779
expected: FAIL