From b5722e50bb5f9c0bcd0cb3fb664b2756c849ee6d Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Sun, 9 Apr 2017 17:34:16 -0700 Subject: [PATCH] Provide MIME type data for File in formdata::get_file --- components/script/dom/bindings/structuredclone.rs | 2 +- components/script/dom/blob.rs | 2 +- components/script/dom/formdata.rs | 2 +- tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs index ed3cf6aa6e2d..b3a9df326950 100644 --- a/components/script/dom/bindings/structuredclone.rs +++ b/components/script/dom/bindings/structuredclone.rs @@ -87,7 +87,7 @@ unsafe fn write_blob(blob: Root, -> Result<(), ()> { let blob_vec = try!(blob.get_bytes()); let blob_length = blob_vec.len(); - let type_string_bytes = blob.get_type_string().as_bytes().to_vec(); + let type_string_bytes = blob.type_string().as_bytes().to_vec(); let type_string_length = type_string_bytes.len(); assert!(JS_WriteUint32Pair(w, StructuredCloneTags::DomBlob as u32, 0)); write_length(w, blob_length); diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index d8ed5fa1b64b..cb61ced9e3a8 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -164,7 +164,7 @@ impl Blob { } /// Get a copy of the type_string - pub fn get_type_string(&self) -> String { + pub fn type_string(&self) -> String { self.type_string.clone() } diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index 2b8ca8f4d46f..6c429c547434 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -153,7 +153,7 @@ impl FormData { let bytes = blob.get_bytes().unwrap_or(vec![]); - File::new(&self.global(), BlobImpl::new_from_bytes(bytes), name, None, "") + File::new(&self.global(), BlobImpl::new_from_bytes(bytes), name, None, &blob.type_string()) } pub fn datums(&self) -> Vec { diff --git a/tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini b/tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini index 32cb3afc3c5f..b88e3c6de2d8 100644 --- a/tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini @@ -3,6 +3,3 @@ [formdata with blob] expected: FAIL - [formdata with named blob] - expected: FAIL -