auto merge of #4108 : shinglyu/servo/blob, r=jdm

Let's build this incrementally. I implemented a `Blob` that can hold a `DOMString`, and has `size` attribute and `slice(...)` method. I'll finish the rest in later PRs.

1 files changed, 5 insertions, 5 deletions

diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs
index 26555755401..52fb22abd12 100644
--- a/components/script/dom/file.rs
+++ b/components/script/dom/file.rs
@@ -18,9 +18,9 @@ pub struct File {
 }
 
 impl File {
-    fn new_inherited(_file_bits: JSRef<Blob>, name: DOMString) -> File {
+    fn new_inherited(global: &GlobalRef, _file_bits: JSRef<Blob>, name: DOMString) -> File {
         File {
-            blob: Blob::new_inherited(),
+            blob: Blob::new_inherited(global, None),
             name: name,
             type_: FileTypeId
         }
@@ -28,9 +28,9 @@ impl File {
         // the relevant subfields of file_bits should be copied over
     }
 
-    pub fn new(global: GlobalRef, file_bits: JSRef<Blob>, name: DOMString) -> Temporary<File> {
-        reflect_dom_object(box File::new_inherited(file_bits, name),
-                           global,
+    pub fn new(global: &GlobalRef, file_bits: JSRef<Blob>, name: DOMString) -> Temporary<File> {
+        reflect_dom_object(box File::new_inherited(global, file_bits, name),
+                           *global,
                            FileBinding::Wrap)
     }