diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h index 1cbcb78e347..f4c91a827f0 100644 --- a/content/base/public/nsDOMFile.h +++ b/content/base/public/nsDOMFile.h @@ -201,9 +201,6 @@ public: virtual nsresult GetInternalStream(nsIInputStream** aStream) = 0; - virtual nsresult - GetInternalUrl(nsIPrincipal* aPrincipal, nsAString& aURL) = 0; - virtual int64_t GetFileId() = 0; virtual void AddFileInfo(indexedDB::FileInfo* aFileInfo) = 0; @@ -336,8 +333,6 @@ public: virtual nsresult GetInternalStream(nsIInputStream** aStream) MOZ_OVERRIDE; - virtual nsresult GetInternalUrl(nsIPrincipal* aPrincipal, nsAString& aURL) MOZ_OVERRIDE; - virtual int64_t GetFileId() MOZ_OVERRIDE; virtual void AddFileInfo(indexedDB::FileInfo* aFileInfo) MOZ_OVERRIDE; diff --git a/content/base/public/nsIDOMFile.idl b/content/base/public/nsIDOMFile.idl index b894276808d..6076a10bb3b 100644 --- a/content/base/public/nsIDOMFile.idl +++ b/content/base/public/nsIDOMFile.idl @@ -26,16 +26,13 @@ interface nsIURI; interface nsIPrincipal; interface nsIDOMBlob; -[scriptable, builtinclass, uuid(b1723fac-4814-4429-82cb-dc54ba0d46d6)] +[scriptable, builtinclass, uuid(6ef56697-7c9c-41ac-83df-e01c079fb1d1)] interface nsIDOMBlob : nsISupports { readonly attribute unsigned long long size; readonly attribute DOMString type; [noscript] readonly attribute nsIInputStream internalStream; - // The caller is responsible for releasing the internalUrl from the - // blob: protocol handler - [noscript] DOMString getInternalUrl(in nsIPrincipal principal); [optional_argc] nsIDOMBlob slice([optional] in long long start, [optional] in long long end, diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp index 0b1fefa4add..1ab34fe4a9c 100644 --- a/content/base/src/nsDOMFile.cpp +++ b/content/base/src/nsDOMFile.cpp @@ -409,12 +409,6 @@ DOMFile::GetInternalStream(nsIInputStream** aStream) return mImpl->GetInternalStream(aStream); } -NS_IMETHODIMP -DOMFile::GetInternalUrl(nsIPrincipal* aPrincipal, nsAString& aURL) -{ - return mImpl->GetInternalUrl(aPrincipal, aURL); -} - NS_IMETHODIMP_(int64_t) DOMFile::GetFileId() { @@ -594,22 +588,6 @@ DOMFileImplBase::GetInternalStream(nsIInputStream** aStream) return NS_ERROR_NOT_IMPLEMENTED; } -nsresult -DOMFileImplBase::GetInternalUrl(nsIPrincipal* aPrincipal, nsAString& aURL) -{ - NS_ENSURE_STATE(aPrincipal); - - nsCString url; - nsresult rv = nsBlobProtocolHandler::AddDataEntry( - NS_LITERAL_CSTRING(BLOBURI_SCHEME), this, aPrincipal, url); - if (NS_FAILED(rv)) { - return rv; - } - - CopyASCIItoUTF16(url, aURL); - return NS_OK; -} - int64_t DOMFileImplBase::GetFileId() {