From 833224aa51d6c1fceababbc94fe5786801f04d14 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Fri, 17 Sep 2010 16:08:03 -0700
Subject: [PATCH] Bug 596385: Remove File.url since the spec now uses a
 different syntax. r=jst a=blocker

---
 content/base/public/nsIDOMFile.idl |  4 +---
 content/base/src/nsDOMFile.cpp     | 16 ----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/content/base/public/nsIDOMFile.idl b/content/base/public/nsIDOMFile.idl
index 9e63b5dfeb5..89cc6deb239 100644
--- a/content/base/public/nsIDOMFile.idl
+++ b/content/base/public/nsIDOMFile.idl
@@ -41,7 +41,7 @@ interface nsIDOMFileError;
 interface nsIInputStream;
 interface nsIURI;
 
-[scriptable, uuid(e72e2d6e-e267-4ea1-a798-6703d3a2c362)]
+[scriptable, uuid(414e5d40-c831-4b28-acdc-8ff02d1a317d)]
 interface nsIDOMFile : nsISupports
 {
   //fileName and fileSize are now deprecated attributes
@@ -53,8 +53,6 @@ interface nsIDOMFile : nsISupports
   readonly attribute unsigned long long size;
   readonly attribute DOMString type;
 
-  readonly attribute DOMString url;
-
   DOMString getAsText(in DOMString encoding); // raises(FileException) on retrieval
   DOMString getAsDataURL();             // raises(FileException) on retrieval
   DOMString getAsBinary();              // raises(FileException) on retrieval
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index 532f04371df..f519fdcb929 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -177,22 +177,6 @@ nsDOMFile::GetInternalStream(nsIInputStream **aStream)
                                     nsIFileInputStream::REOPEN_ON_REWIND);
 }
 
-NS_IMETHODIMP
-nsDOMFile::GetUrl(nsAString& aURL)
-{
-  if (mURL.IsEmpty()) {
-    GetInternalUrl(mURL);
-
-    nsCOMPtr<nsIDocument> doc = do_QueryReferent(mRelatedDoc);
-    NS_LossyConvertUTF16toASCII shortURL(mURL);
-    doc->RegisterFileDataUri(shortURL);
-  }
-
-  aURL = mURL;
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMFile::GetInternalUrl(nsAString& aURL)
 {