Rewrite Blob constructor interface

5 files changed, 59 insertions, 49 deletions

diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs
index 74ddce1609a..2ef0479ab9b 100644
--- a/components/script/dom/blob.rs
+++ b/components/script/dom/blob.rs
@@ -28,6 +28,7 @@ pub struct DataSlice {
 }
 
 impl DataSlice {
+    /// Construct DataSlice from reference counted bytes
     pub fn new(bytes: Arc<Vec<u8>>, start: Option<i64>, end: Option<i64>) -> DataSlice {
         let size = bytes.len() as i64;
         let relativeStart: i64 = match start {
@@ -62,14 +63,21 @@ impl DataSlice {
         }
     }
 
-    pub fn get_bytes(&self) -> &[u8] {
-        &self.bytes[self.bytes_start..self.bytes_end]
+    /// Construct an empty data slice
+    pub fn empty() -> DataSlice {
+        DataSlice {
+            bytes: Arc::new(Vec::new()),
+            bytes_start: 0,
+            bytes_end: 0,
+        }
     }
 
-    pub fn get_all_bytes(&self) -> Arc<Vec<u8>> {
-        self.bytes.clone()
+    /// Get sliced bytes
+    pub fn get_bytes(&self) -> &[u8] {
+        &self.bytes[self.bytes_start..self.bytes_end]
     }
 
+    /// Get length of sliced bytes
     pub fn size(&self) -> u64 {
         (self.bytes_end as u64) - (self.bytes_start as u64)
     }
@@ -86,40 +94,22 @@ pub struct Blob {
     isClosed_: Cell<bool>,
 }
 
-fn is_ascii_printable(string: &str) -> bool {
-    // Step 5.1 in Sec 5.1 of File API spec
-    // https://w3c.github.io/FileAPI/#constructorBlob
-    string.chars().all(|c| c >= '\x20' && c <= '\x7E')
-}
-
 impl Blob {
-    pub fn new_inherited(bytes: Arc<Vec<u8>>,
-                         bytes_start: Option<i64>,
-                         bytes_end: Option<i64>,
-                         typeString: &str) -> Blob {
+
+    pub fn new(global: GlobalRef, slice: DataSlice, typeString: &str) -> Root<Blob> {
+        let boxed_blob = box Blob::new_inherited(slice, typeString);
+        reflect_dom_object(boxed_blob, global, BlobBinding::Wrap)
+    }
+
+    pub fn new_inherited(slice: DataSlice, typeString: &str) -> Blob {
         Blob {
             reflector_: Reflector::new(),
-            data: DataSlice::new(bytes, bytes_start, bytes_end),
+            data: slice,
             typeString: typeString.to_owned(),
             isClosed_: Cell::new(false),
         }
     }
 
-    pub fn new(global: GlobalRef, bytes: Vec<u8>, typeString: &str) -> Root<Blob> {
-        let boxed_blob = box Blob::new_inherited(Arc::new(bytes), None, None, typeString);
-        reflect_dom_object(boxed_blob, global, BlobBinding::Wrap)
-    }
-
-    fn new_sliced(global: GlobalRef,
-                  bytes: Arc<Vec<u8>>,
-                  bytes_start: Option<i64>,
-                  bytes_end: Option<i64>,
-                  typeString: &str) -> Root<Blob> {
-
-      let boxed_blob = box Blob::new_inherited(bytes, bytes_start, bytes_end, typeString);
-      reflect_dom_object(boxed_blob, global, BlobBinding::Wrap)
-    }
-
     // https://w3c.github.io/FileAPI/#constructorBlob
     pub fn Constructor(global: GlobalRef,
                        blobParts: Option<Vec<BlobOrString>>,
@@ -143,12 +133,9 @@ impl Blob {
                 .collect()
             }
         };
-        let typeString = if is_ascii_printable(&blobPropertyBag.type_) {
-            &*blobPropertyBag.type_
-        } else {
-            ""
-        };
-        Ok(Blob::new(global, bytes, &typeString.to_ascii_lowercase()))
+
+        let slice = DataSlice::new(Arc::new(bytes), None, None);
+        Ok(Blob::new(global, slice, blobPropertyBag.get_typestring()))
     }
 
     pub fn get_data(&self) -> &DataSlice {
@@ -187,7 +174,7 @@ impl BlobMethods for Blob {
         };
         let global = self.global();
         let bytes = self.data.bytes.clone();
-        Blob::new_sliced(global.r(), bytes, start, end, &relativeContentType)
+        Blob::new(global.r(), DataSlice::new(bytes, start, end), &relativeContentType)
     }
 
     // https://w3c.github.io/FileAPI/#dfn-isClosed
@@ -209,3 +196,20 @@ impl BlobMethods for Blob {
 
     }
 }
+
+
+impl BlobBinding::BlobPropertyBag {
+    pub fn get_typestring(&self) -> &str {
+        if is_ascii_printable(&self.type_) {
+            &*self.type_
+        } else {
+            ""
+        }
+    }
+}
+
+fn is_ascii_printable(string: &str) -> bool {
+    // Step 5.1 in Sec 5.1 of File API spec
+    // https://w3c.github.io/FileAPI/#constructorBlob
+    string.chars().all(|c| c >= '\x20' && c <= '\x7E')
+}
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
index 04116b29534..f8b45599b18 100644
--- a/components/script/dom/testbinding.rs
+++ b/components/script/dom/testbinding.rs
@@ -20,7 +20,7 @@ use dom::bindings::num::Finite;
 use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object};
 use dom::bindings::str::{ByteString, USVString};
 use dom::bindings::weakref::MutableWeakRef;
-use dom::blob::Blob;
+use dom::blob::{Blob, DataSlice};
 use dom::url::URL;
 use js::jsapi::{HandleValue, JSContext, JSObject};
 use js::jsval::{JSVal, NullValue};
@@ -100,7 +100,7 @@ impl TestBindingMethods for TestBinding {
     fn EnumAttribute(&self) -> TestEnum { TestEnum::_empty }
     fn SetEnumAttribute(&self, _: TestEnum) {}
     fn InterfaceAttribute(&self) -> Root<Blob> {
-        Blob::new(self.global().r(), Vec::new(), "")
+        Blob::new(self.global().r(), DataSlice::empty(), "")
     }
     fn SetInterfaceAttribute(&self, _: &Blob) {}
     fn UnionAttribute(&self) -> HTMLElementOrLong { HTMLElementOrLong::Long(0) }
@@ -178,7 +178,7 @@ impl TestBindingMethods for TestBinding {
     fn SetAttr_to_automatically_rename(&self, _: DOMString) {}
     fn GetEnumAttributeNullable(&self) -> Option<TestEnum> { Some(TestEnum::_empty) }
     fn GetInterfaceAttributeNullable(&self) -> Option<Root<Blob>> {
-        Some(Blob::new(self.global().r(), Vec::new(), ""))
+        Some(Blob::new(self.global().r(), DataSlice::empty(), ""))
     }
     fn SetInterfaceAttributeNullable(&self, _: Option<&Blob>) {}
     fn GetInterfaceAttributeWeak(&self) -> Option<Root<URL>> {
@@ -229,7 +229,7 @@ impl TestBindingMethods for TestBinding {
     fn ReceiveByteString(&self) -> ByteString { ByteString::new(vec!()) }
     fn ReceiveEnum(&self) -> TestEnum { TestEnum::_empty }
     fn ReceiveInterface(&self) -> Root<Blob> {
-        Blob::new(self.global().r(), Vec::new(), "")
+        Blob::new(self.global().r(), DataSlice::empty(), "")
     }
     fn ReceiveAny(&self, _: *mut JSContext) -> JSVal { NullValue() }
     fn ReceiveObject(&self, _: *mut JSContext) -> *mut JSObject { panic!() }
@@ -246,7 +246,7 @@ impl TestBindingMethods for TestBinding {
     }
     fn ReceiveSequence(&self) -> Vec<i32> { vec![1] }
     fn ReceiveInterfaceSequence(&self) -> Vec<Root<Blob>> {
-        vec![Blob::new(self.global().r(), Vec::new(), "")]
+        vec![Blob::new(self.global().r(), DataSlice::empty(), "")]
     }
 
     fn ReceiveNullableBoolean(&self) -> Option<bool> { Some(false) }
@@ -267,7 +267,7 @@ impl TestBindingMethods for TestBinding {
     fn ReceiveNullableByteString(&self) -> Option<ByteString> { Some(ByteString::new(vec!())) }
     fn ReceiveNullableEnum(&self) -> Option<TestEnum> { Some(TestEnum::_empty) }
     fn ReceiveNullableInterface(&self) -> Option<Root<Blob>> {
-        Some(Blob::new(self.global().r(), Vec::new(), ""))
+        Some(Blob::new(self.global().r(), DataSlice::empty(), ""))
     }
     fn ReceiveNullableObject(&self, _: *mut JSContext) -> *mut JSObject { ptr::null_mut() }
     fn ReceiveNullableUnion(&self) -> Option<HTMLElementOrLong> {
diff --git a/components/script/dom/webidls/Blob.webidl b/components/script/dom/webidls/Blob.webidl
index f0e3413d086..dcc7cb5ea42 100644
--- a/components/script/dom/webidls/Blob.webidl
+++ b/components/script/dom/webidls/Blob.webidl
@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// http://dev.w3.org/2006/webapi/FileAPI/#dfn-Blob
-[Constructor(optional sequence<(/*ArrayBuffer or ArrayBufferView or */Blob or DOMString)> blobParts,
+// https://w3c.github.io/FileAPI/#blob
+
+[Constructor(optional sequence<BlobPart> blobParts,
   optional BlobPropertyBag options),
  Exposed=Window/*,Worker*/]
 interface Blob {
@@ -26,3 +27,5 @@ dictionary BlobPropertyBag {
   DOMString type = "";
 
 };
+
+typedef (/*ArrayBuffer or ArrayBufferView or */Blob or DOMString) BlobPart;
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 861c91090c8..1145e188555 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -18,7 +18,7 @@ use dom::bindings::refcounted::Trusted;
 use dom::bindings::reflector::{Reflectable, reflect_dom_object};
 use dom::bindings::str::{USVString, is_token};
 use dom::bindings::trace::JSTraceable;
-use dom::blob::Blob;
+use dom::blob::{Blob, DataSlice};
 use dom::closeevent::CloseEvent;
 use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::eventtarget::EventTarget;
@@ -42,6 +42,7 @@ use std::ascii::AsciiExt;
 use std::borrow::ToOwned;
 use std::cell::Cell;
 use std::ptr;
+use std::sync::Arc;
 use std::thread;
 use util::str::DOMString;
 use websocket::client::request::Url;
@@ -598,7 +599,8 @@ impl Runnable for MessageReceivedTask {
                 MessageData::Binary(data) => {
                     match ws.binary_type.get() {
                         BinaryType::Blob => {
-                            let blob = Blob::new(global.r(), data, "");
+                            let slice = DataSlice::new(Arc::new(data), None, None);
+                            let blob = Blob::new(global.r(), slice, "");
                             blob.to_jsval(cx, message.handle_mut());
                         }
                         BinaryType::Arraybuffer => {
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index a061230898b..49f4be06d9b 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -22,7 +22,7 @@ use dom::bindings::js::{Root, RootedReference};
 use dom::bindings::refcounted::Trusted;
 use dom::bindings::reflector::{Reflectable, reflect_dom_object};
 use dom::bindings::str::{ByteString, USVString, is_token};
-use dom::blob::Blob;
+use dom::blob::{Blob, DataSlice};
 use dom::document::DocumentSource;
 use dom::document::{Document, IsHTMLDocument};
 use dom::event::{Event, EventBubbles, EventCancelable};
@@ -1117,7 +1117,8 @@ impl XMLHttpRequest {
         let mime = self.final_mime_type().as_ref().map(Mime::to_string).unwrap_or("".to_owned());
 
         // Step 3, 4
-        let blob = Blob::new(self.global().r(), self.response.borrow().to_vec(), &mime);
+        let slice = DataSlice::new(Arc::new(self.response.borrow().to_vec()), None, None);
+        let blob = Blob::new(self.global().r(), slice, &mime);
         self.response_blob.set(Some(blob.r()));
         blob
     }