From 912ac622e7d53d8524186778cc32107a9b7a0b45 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Sun, 9 Apr 2017 23:30:40 -0700
Subject: [PATCH] Follow the spec in giving blobs a 'blob' name attribute

---
 components/script/dom/formdata.rs                      | 10 +++++++---
 .../wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini  |  5 -----
 2 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini

diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs
index 6c429c54743..af4c692e7d9 100644
--- a/components/script/dom/formdata.rs
+++ b/components/script/dom/formdata.rs
@@ -7,6 +7,7 @@ use dom::bindings::codegen::Bindings::FormDataBinding::FormDataMethods;
 use dom::bindings::codegen::Bindings::FormDataBinding::FormDataWrap;
 use dom::bindings::codegen::UnionTypes::FileOrUSVString;
 use dom::bindings::error::Fallible;
+use dom::bindings::inheritance::Castable;
 use dom::bindings::iterable::Iterable;
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
@@ -79,7 +80,7 @@ impl FormDataMethods for FormData {
         let datum = FormDatum {
             ty: DOMString::from("file"),
             name: DOMString::from(name.0.clone()),
-            value: FormDatumValue::File(Root::from_ref(&*self.get_file(blob, filename))),
+            value: FormDatumValue::File(Root::from_ref(&*self.create_an_entry(blob, filename))),
         };
 
         let mut data = self.data.borrow_mut();
@@ -137,7 +138,7 @@ impl FormDataMethods for FormData {
         self.data.borrow_mut().insert(LocalName::from(name.0.clone()), vec![FormDatum {
             ty: DOMString::from("file"),
             name: DOMString::from(name.0),
-            value: FormDatumValue::File(Root::from_ref(&*self.get_file(blob, filename))),
+            value: FormDatumValue::File(Root::from_ref(&*self.create_an_entry(blob, filename))),
         }]);
     }
 
@@ -145,9 +146,12 @@ impl FormDataMethods for FormData {
 
 
 impl FormData {
-    fn get_file(&self, blob: &Blob, opt_filename: Option<USVString>) -> Root<File> {
+    // https://xhr.spec.whatwg.org/#create-an-entry
+    // Steps 3-4.
+    fn create_an_entry(&self, blob: &Blob, opt_filename: Option<USVString>) -> Root<File> {
         let name = match opt_filename {
             Some(filename) => DOMString::from(filename.0),
+            None if blob.downcast::<File>().is_none() => DOMString::from("blob"),
             None => DOMString::from(""),
         };
 
diff --git a/tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini b/tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini
deleted file mode 100644
index b88e3c6de2d..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/formdata-blob.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[formdata-blob.htm]
-  type: testharness
-  [formdata with blob]
-    expected: FAIL
-