Bug 757284: Restore Blob.mozSlice. r=sicking a=akeybl

mozilla · Jun 4, 2012 · 2eb4e98 · 2eb4e98
1 parent 73587e8
commit 2eb4e98
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 0 deletions.
diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h
@@ -70,6 +70,7 @@ class nsIBlobBuilder;
 nsresult NS_NewBlobBuilder(nsISupports* *aSupports);
 
 class nsDOMFileBase : public nsIDOMFile,
+                      public nsIDOMBlob_GECKO_13,
                       public nsIXHRSendable,
                       public nsIMutable
 {
@@ -116,6 +117,7 @@ class nsDOMFileBase : public nsIDOMFile,
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMBLOB
   NS_DECL_NSIDOMFILE
+  NS_DECL_NSIDOMBLOB_GECKO_13
   NS_DECL_NSIXHRSENDABLE
   NS_DECL_NSIMUTABLE
 

diff --git a/content/base/public/nsIDOMFile.idl b/content/base/public/nsIDOMFile.idl
@@ -88,6 +88,14 @@ interface nsIDOMBlob : nsISupports
   [notxpcom] FileInfo getFileInfo(in FileManager aFileManager);
 };
 
+[scriptable, builtinclass, uuid(96a9f6f5-2353-47a3-9bf5-4b1e0fe11c08)]
+interface nsIDOMBlob_GECKO_13 : nsISupports
+{
+  [optional_argc] nsIDOMBlob mozSlice([optional] in long long start,
+                                      [optional] in long long end,
+                                      [optional] in DOMString contentType);
+};
+
 [scriptable, builtinclass, uuid(b096ef67-7b77-47f8-8e70-5d8ee36416bf)]
 interface nsIDOMFile : nsIDOMBlob
 {

diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
@@ -142,6 +142,7 @@ DOMCI_DATA(Blob, nsDOMFileBase)
 NS_INTERFACE_MAP_BEGIN(nsDOMFileBase)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFile)
   NS_INTERFACE_MAP_ENTRY(nsIDOMBlob)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMBlob_GECKO_13)
   NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIDOMFile, mIsFile)
   NS_INTERFACE_MAP_ENTRY(nsIXHRSendable)
   NS_INTERFACE_MAP_ENTRY(nsIMutable)
@@ -262,6 +263,16 @@ nsDOMFileBase::Slice(PRInt64 aStart, PRInt64 aEnd,
   return *aBlob ? NS_OK : NS_ERROR_UNEXPECTED;
 }
 
+NS_IMETHODIMP
+nsDOMFileBase::MozSlice(PRInt64 aStart, PRInt64 aEnd,
+                        const nsAString& aContentType, PRUint8 optional_argc,
+                        nsIDOMBlob **aBlob)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  return Slice(aStart, aEnd, aContentType, optional_argc, aBlob);
+}
+
 NS_IMETHODIMP
 nsDOMFileBase::GetInternalStream(nsIInputStream **aStream)
 {

diff --git a/content/base/test/fileutils.js b/content/base/test/fileutils.js
@@ -204,6 +204,10 @@ function testSlice(file, size, type, contents, fileType) {
   var slice = file.slice(0, size);
   ok(slice instanceof Blob, fileType + " fullsize slice is a Blob");
   ok(!(slice instanceof File), fileType + " fullsize slice is not a File");
+
+  var slice = file.mozSlice(0, size);
+  ok(slice instanceof Blob, fileType + " fullsize slice is a Blob");
+  ok(!(slice instanceof File), fileType + " fullsize slice is not a File");
 
   slice = file.slice(0, 1234);
   ok(slice instanceof Blob, fileType + " sized slice is a Blob");

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
@@ -3980,10 +3980,12 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(Blob, nsIDOMBlob)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob_GECKO_13)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(File, nsIDOMFile)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob_GECKO_13)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMFile)
   DOM_CLASSINFO_MAP_END