Bug 887364 - URL API for main thread. r=ehsan

content/base/public/nsContentUtils.h

@@ -1590,6 +1590,7 @@ public:
   static nsresult GetUTFOrigin(nsIPrincipal* aPrincipal,
                                nsString& aOrigin);
   static nsresult GetUTFOrigin(nsIURI* aURI, nsString& aOrigin);
+  static void GetUTFNonNullOrigin(nsIURI* aURI, nsString& aOrigin);
 
   /**
    * This method creates and dispatches "command" event, which implements

content/base/src/Link.cpp

@@ -181,32 +181,7 @@ Link::SetHost(const nsAString &aHost)
     return;
   }
 
-  // We cannot simply call nsIURI::SetHost because that would treat the name as
-  // an IPv6 address (like http:://[server:443]/).  We also cannot call
-  // nsIURI::SetHostPort because that isn't implemented.  Sadfaces.
-
-  // First set the hostname.
-  nsAString::const_iterator start, end;
-  aHost.BeginReading(start);
-  aHost.EndReading(end);
-  nsAString::const_iterator iter(start);
-  (void)FindCharInReadable(':', iter, end);
-  NS_ConvertUTF16toUTF8 host(Substring(start, iter));
-  (void)uri->SetHost(host);
-
-  // Also set the port if needed.
-  if (iter != end) {
-    iter++;
-    if (iter != end) {
-      nsAutoString portStr(Substring(iter, end));
-      nsresult rv;
-      int32_t port = portStr.ToInteger(&rv);
-      if (NS_SUCCEEDED(rv)) {
-        (void)uri->SetPort(port);
-      }
-    }
-  };
-
+  (void)uri->SetHostPort(NS_ConvertUTF16toUTF8(aHost));
   SetHrefAttribute(uri);
   return;
 }
@@ -296,14 +271,8 @@ Link::GetOrigin(nsAString &aOrigin)
   }
 
   nsString origin;
-  nsresult rv = nsContentUtils::GetUTFOrigin(uri, origin);
-  if (NS_FAILED(rv)) {
-    return;
-  }
-
-  if (!aOrigin.EqualsLiteral("null")) {
-    aOrigin.Assign(origin);
-  }
+  nsContentUtils::GetUTFNonNullOrigin(uri, origin);
+  aOrigin.Assign(origin);
 }
 
 void

content/base/src/nsContentUtils.cpp

@@ -5516,6 +5516,19 @@ nsContentUtils::GetUTFOrigin(nsIURI* aURI, nsString& aOrigin)
   return NS_OK;
 }
 
+/* static */
+void
+nsContentUtils::GetUTFNonNullOrigin(nsIURI* aURI, nsString& aOrigin)
+{
+  aOrigin.Truncate();
+
+  nsString origin;
+  nsresult rv = GetUTFOrigin(aURI, origin);
+  if (NS_SUCCEEDED(rv) && !origin.EqualsLiteral("null")) {
+    aOrigin.Assign(origin);
+  }
+}
+
 /* static */
 already_AddRefed<nsIDocument>
 nsContentUtils::GetDocumentFromScriptContext(nsIScriptContext *aScriptContext)

dom/base/URL.cpp

@@ -9,13 +9,100 @@
 #include "nsIDOMFile.h"
 #include "DOMMediaStream.h"
 #include "mozilla/dom/MediaSource.h"
-#include "nsIDocument.h"
-#include "nsIPrincipal.h"
+#include "mozilla/dom/URLBinding.h"
 #include "nsHostObjectProtocolHandler.h"
+#include "nsServiceManagerUtils.h"
+#include "nsIIOService.h"
+#include "nsEscape.h"
+#include "nsNetCID.h"
+#include "nsIURL.h"
 
 namespace mozilla {
 namespace dom {
 
+NS_IMPL_CYCLE_COLLECTION_1(URL, mWindow)
+
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(URL, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(URL, Release)
+
+URL::URL(nsPIDOMWindow* aWindow, nsIURI* aURI)
+  : mWindow(aWindow)
+  , mURI(aURI)
+{
+}
+
+JSObject*
+URL::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
+{
+  return URLBinding::Wrap(aCx, aScope, this);
+}
+
+/* static */ already_AddRefed<URL>
+URL::Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+                 URL& aBase, ErrorResult& aRv)
+{
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal.GetAsSupports());
+  if (!window) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return nullptr;
+  }
+
+  nsresult rv;
+  nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv));
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIURI> uri;
+  rv = ioService->NewURI(NS_ConvertUTF16toUTF8(aUrl), nullptr, aBase.GetURI(),
+                         getter_AddRefs(uri));
+  if (NS_FAILED(rv)) {
+    aRv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
+    return nullptr;
+  }
+
+  nsRefPtr<URL> url = new URL(window, uri);
+  return url.forget();
+}
+
+/* static */ already_AddRefed<URL>
+URL::Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+                  const nsAString& aBase, ErrorResult& aRv)
+{
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal.GetAsSupports());
+  if (!window) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return nullptr;
+  }
+
+  nsresult rv;
+  nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv));
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIURI> baseUri;
+  rv = ioService->NewURI(NS_ConvertUTF16toUTF8(aBase), nullptr, nullptr,
+                         getter_AddRefs(baseUri));
+  if (NS_FAILED(rv)) {
+    aRv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIURI> uri;
+  rv = ioService->NewURI(NS_ConvertUTF16toUTF8(aUrl), nullptr, baseUri,
+                         getter_AddRefs(uri));
+  if (NS_FAILED(rv)) {
+    aRv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
+    return nullptr;
+  }
+
+  nsRefPtr<URL> url = new URL(window, uri);
+  return url.forget();
+}
+
 void
 URL::CreateObjectURL(const GlobalObject& aGlobal,
                      nsIDOMBlob* aBlob,
@@ -53,9 +140,8 @@ URL::CreateObjectURL(const GlobalObject& aGlobal, MediaSource& aSource,
 void
 URL::CreateObjectURLInternal(nsISupports* aGlobal, nsISupports* aObject,
                              const nsACString& aScheme,
-                             const mozilla::dom::objectURLOptions& aOptions,
-                             nsString& aResult,
-                             ErrorResult& aError)
+                             const objectURLOptions& aOptions,
+                             nsString& aResult, ErrorResult& aError)
 {
   nsCOMPtr<nsPIDOMWindow> w = do_QueryInterface(aGlobal);
   nsGlobalWindow* window = static_cast<nsGlobalWindow*>(w.get());
@@ -111,5 +197,218 @@ URL::RevokeObjectURL(const GlobalObject& aGlobal, const nsAString& aURL)
   }
 }
 
+void
+URL::GetHref(nsString& aHref) const
+{
+  aHref.Truncate();
+
+  nsAutoCString href;
+  nsresult rv = mURI->GetSpec(href);
+  if (NS_SUCCEEDED(rv)) {
+    CopyUTF8toUTF16(href, aHref);
+  }
+}
+
+void
+URL::SetHref(const nsAString& aHref, ErrorResult& aRv)
+{
+  aRv = mURI->SetSpec(NS_ConvertUTF16toUTF8(aHref));
+}
+
+void
+URL::GetOrigin(nsString& aOrigin) const
+{
+  nsContentUtils::GetUTFNonNullOrigin(mURI, aOrigin);
+}
+
+void
+URL::GetProtocol(nsString& aProtocol) const
+{
+  nsCString protocol;
+  if (NS_SUCCEEDED(mURI->GetScheme(protocol))) {
+    aProtocol.Truncate();
+  }
+
+  CopyASCIItoUTF16(protocol, aProtocol);
+  aProtocol.Append(PRUnichar(':'));
+}
+
+void
+URL::SetProtocol(const nsAString& aProtocol)
+{
+  nsAString::const_iterator start, end;
+  aProtocol.BeginReading(start);
+  aProtocol.EndReading(end);
+  nsAString::const_iterator iter(start);
+
+  FindCharInReadable(':', iter, end);
+  mURI->SetScheme(NS_ConvertUTF16toUTF8(Substring(start, iter)));
+}
+
+#define URL_GETTER( value, func ) \
+  value.Truncate();               \
+  nsAutoCString tmp;              \
+  nsresult rv = mURI->func(tmp);  \
+  if (NS_SUCCEEDED(rv)) {         \
+    CopyUTF8toUTF16(tmp, value);  \
+  }
+
+void
+URL::GetUsername(nsString& aUsername) const
+{
+  URL_GETTER(aUsername, GetUsername);
+}
+
+void
+URL::SetUsername(const nsAString& aUsername)
+{
+  mURI->SetUsername(NS_ConvertUTF16toUTF8(aUsername));
+}
+
+void
+URL::GetPassword(nsString& aPassword) const
+{
+  URL_GETTER(aPassword, GetPassword);
+}
+
+void
+URL::SetPassword(const nsAString& aPassword)
+{
+  mURI->SetPassword(NS_ConvertUTF16toUTF8(aPassword));
+}
+
+void
+URL::GetHost(nsString& aHost) const
+{
+  URL_GETTER(aHost, GetHostPort);
+}
+
+void
+URL::SetHost(const nsAString& aHost)
+{
+  mURI->SetHostPort(NS_ConvertUTF16toUTF8(aHost));
+}
+
+void
+URL::GetHostname(nsString& aHostname) const
+{
+  URL_GETTER(aHostname, GetHost);
+}
+
+void
+URL::SetHostname(const nsAString& aHostname)
+{
+  mURI->SetHost(NS_ConvertUTF16toUTF8(aHostname));
+}
+
+void
+URL::GetPort(nsString& aPort) const
+{
+  aPort.Truncate();
+
+  int32_t port;
+  nsresult rv = mURI->GetPort(&port);
+  if (NS_SUCCEEDED(rv) && port != -1) {
+    nsAutoString portStr;
+    portStr.AppendInt(port, 10);
+    aPort.Assign(portStr);
+  }
+}
+
+void
+URL::SetPort(const nsAString& aPort)
+{
+  nsresult rv;
+  nsAutoString portStr(aPort);
+  int32_t port = portStr.ToInteger(&rv);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  mURI->SetPort(port);
+}
+
+void
+URL::GetPathname(nsString& aPathname) const
+{
+  aPathname.Truncate();
+
+  nsCOMPtr<nsIURL> url(do_QueryInterface(mURI));
+  if (!url) {
+    // Do not throw!  Not having a valid URI or URL should result in an empty
+    // string.
+    return;
+  }
+
+  nsAutoCString file;
+  nsresult rv = url->GetFilePath(file);
+  if (NS_SUCCEEDED(rv)) {
+    CopyUTF8toUTF16(file, aPathname);
+  }
+}
+
+void
+URL::SetPathname(const nsAString& aPathname)
+{
+  nsCOMPtr<nsIURL> url(do_QueryInterface(mURI));
+  if (!url) {
+    // Ignore failures to be compatible with NS4.
+    return;
+  }
+
+  url->SetFilePath(NS_ConvertUTF16toUTF8(aPathname));
+}
+
+void
+URL::GetSearch(nsString& aSearch) const
+{
+  aSearch.Truncate();
+
+  nsCOMPtr<nsIURL> url(do_QueryInterface(mURI));
+  if (!url) {
+    // Do not throw!  Not having a valid URI or URL should result in an empty
+    // string.
+    return;
+  }
+
+  nsAutoCString search;
+  nsresult rv = url->GetQuery(search);
+  if (NS_SUCCEEDED(rv) && !search.IsEmpty()) {
+    CopyUTF8toUTF16(NS_LITERAL_CSTRING("?") + search, aSearch);
+  }
+}
+
+void
+URL::SetSearch(const nsAString& aSearch)
+{
+  nsCOMPtr<nsIURL> url(do_QueryInterface(mURI));
+  if (!url) {
+    // Ignore failures to be compatible with NS4.
+    return;
+  }
+
+  url->SetQuery(NS_ConvertUTF16toUTF8(aSearch));
+}
+
+void
+URL::GetHash(nsString& aHash) const
+{
+  aHash.Truncate();
+
+  nsAutoCString ref;
+  nsresult rv = mURI->GetRef(ref);
+  if (NS_SUCCEEDED(rv) && !ref.IsEmpty()) {
+    NS_UnescapeURL(ref); // XXX may result in random non-ASCII bytes!
+    aHash.Assign(PRUnichar('#'));
+    AppendUTF8toUTF16(ref, aHash);
+  }
+}
+
+void
+URL::SetHash(const nsAString& aHash)
+{
+  mURI->SetRef(NS_ConvertUTF16toUTF8(aHash));
+}
+
 }
 }

dom/base/URL.h

@@ -5,11 +5,15 @@
 #ifndef URL_h___
 #define URL_h___
 
-#include "nscore.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsAutoPtr.h"
 #include "nsString.h"
 
 class nsIDOMBlob;
 class nsISupports;
+class nsIURI;
+class nsPIDOMWindow;
 
 namespace mozilla {
 
@@ -25,7 +29,27 @@ struct objectURLOptions;
 class URL MOZ_FINAL
 {
 public:
+  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(URL)
+  NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(URL)
+
+  URL(nsPIDOMWindow* aWindow, nsIURI* aURI);
+
   // WebIDL methods
+  nsPIDOMWindow* GetParentObject() const
+  {
+    return mWindow;
+  }
+
+  JSObject*
+  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope);
+
+  static already_AddRefed<URL>
+  Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+              URL& aBase, ErrorResult& aRv);
+  static already_AddRefed<URL>
+  Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+              const nsAString& aBase, ErrorResult& aRv);
+
   static void CreateObjectURL(const GlobalObject& aGlobal,
                               nsIDOMBlob* aBlob,
                               const objectURLOptions& aOptions,
@@ -33,23 +57,73 @@ public:
                               ErrorResult& aError);
   static void CreateObjectURL(const GlobalObject& aGlobal,
                               DOMMediaStream& aStream,
-                              const mozilla::dom::objectURLOptions& aOptions,
+                              const objectURLOptions& aOptions,
                               nsString& aResult,
-                              mozilla::ErrorResult& aError);
+                              ErrorResult& aError);
   static void CreateObjectURL(const GlobalObject& aGlobal,
                               MediaSource& aSource,
                               const objectURLOptions& aOptions,
                               nsString& aResult,
-                              mozilla::ErrorResult& aError);
+                              ErrorResult& aError);
   static void RevokeObjectURL(const GlobalObject& aGlobal,
                               const nsAString& aURL);
 
+  void GetHref(nsString& aHref) const;
+
+  void SetHref(const nsAString& aHref, ErrorResult& aRv);
+
+  void GetOrigin(nsString& aOrigin) const;
+
+  void GetProtocol(nsString& aProtocol) const;
+
+  void SetProtocol(const nsAString& aProtocol);
+
+  void GetUsername(nsString& aUsername) const;
+
+  void SetUsername(const nsAString& aUsername);
+
+  void GetPassword(nsString& aPassword) const;
+
+  void SetPassword(const nsAString& aPassword);
+
+  void GetHost(nsString& aHost) const;
+
+  void SetHost(const nsAString& aHost);
+
+  void GetHostname(nsString& aHostname) const;
+
+  void SetHostname(const nsAString& aHostname);
+
+  void GetPort(nsString& aPort) const;
+
+  void SetPort(const nsAString& aPort);
+
+  void GetPathname(nsString& aPathname) const;
+
+  void SetPathname(const nsAString& aPathname);
+
+  void GetSearch(nsString& aRetval) const;
+
+  void SetSearch(const nsAString& aArg);
+
+  void GetHash(nsString& aRetval) const;
+
+  void SetHash(const nsAString& aArg);
+
 private:
+  nsIURI* GetURI() const
+  {
+    return mURI;
+  }
+
   static void CreateObjectURLInternal(nsISupports* aGlobal, nsISupports* aObject,
                                       const nsACString& aScheme,
-                                      const mozilla::dom::objectURLOptions& aOptions,
+                                      const objectURLOptions& aOptions,
                                       nsString& aResult,
-                                      mozilla::ErrorResult& aError);
+                                      ErrorResult& aError);
+
+  nsRefPtr<nsPIDOMWindow> mWindow;
+  nsCOMPtr<nsIURI> mURI;
 };
 
 }

dom/base/test/Makefile.in

@@ -42,6 +42,7 @@ MOCHITEST_FILES = \
   iframe_messageChannel_pingpong.html \
   test_messageChannel_unshipped.html \
   test_messageChannel_pref.html \
+  test_url.html \
   $(NULL)
 
 MOCHITEST_CHROME_FILES = \

dom/base/test/test_url.html

@@ -0,0 +1,277 @@
+
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=887364
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 887364</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=887364">Mozilla Bug 887364</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <iframe name="x" id="x"></iframe>
+  <iframe name="y" id="y"></iframe>
+</div>
+<pre id="test">
+</pre>
+  <script type="application/javascript">
+
+  /** Test for Bug 887364 **/
+  ok("URL" in window, "window.URL exists");
+
+  var tests = [
+    { url: 'http://www.abc.com',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/',
+      origin: 'http://www.abc.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/',
+      search: '',
+      hash: ''
+    },
+    { url: 'ftp://auser:apw@www.abc.com',
+      base: undefined,
+      error: false,
+      href: 'ftp://auser:apw@www.abc.com/',
+      origin: 'ftp://www.abc.com',
+      protocol: 'ftp:',
+      username: 'auser',
+      password: 'apw',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/',
+      search: '',
+      hash: ''
+    },
+    { url: 'http://www.abc.com:90/apath/',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com:90/apath/',
+      origin: 'http://www.abc.com:90',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com:90',
+      hostname: 'www.abc.com',
+      port: '90',
+      pathname: '/apath/',
+      search: '',
+      hash: ''
+    },
+    { url: 'http://www.abc.com/apath/afile.txt#ahash',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/apath/afile.txt#ahash',
+      origin: 'http://www.abc.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/apath/afile.txt',
+      search: '',
+      hash: '#ahash'
+    },
+    { url: 'http://example.com/?test#hash',
+      base: undefined,
+      error: false,
+      href: 'http://example.com/?test#hash',
+      origin: 'http://example.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'example.com',
+      hostname: 'example.com',
+      port: '',
+      pathname: '/',
+      search: '?test',
+      hash: '#hash'
+    },
+    { url: 'http://example.com/?test',
+      base: undefined,
+      error: false,
+      href: 'http://example.com/?test',
+      origin: 'http://example.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'example.com',
+      hostname: 'example.com',
+      port: '',
+      pathname: '/',
+      search: '?test',
+      hash: ''
+    },
+    { url: 'http://example.com/carrot#question%3f',
+      base: undefined,
+      error: false,
+      hash: '#question?'
+    },
+    { url: 'https://example.com:4443?',
+      base: undefined,
+      error: false,
+      protocol: 'https:',
+      port: '4443',
+      pathname: '/',
+      hash: '',
+      search: ''
+    },
+    { url: 'http://www.abc.com/apath/afile.txt#ahash?asearch',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/apath/afile.txt#ahash?asearch',
+      protocol: 'http:',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash?asearch',
+      search: ''
+    },
+    { url: 'http://www.abc.com/apath/afile.txt?asearch#ahash',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/apath/afile.txt?asearch#ahash',
+      protocol: 'http:',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: '?asearch'
+    },
+    { url: 'http://abc.com/apath/afile.txt?#ahash',
+      base: undefined,
+      error: false,
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: ''
+    },
+    { url: 'http://auser:apassword@www.abc.com:90/apath/afile.txt?asearch#ahash',
+      base: undefined,
+      error: false,
+      protocol: 'http:',
+      username: 'auser',
+      password: 'apassword',
+      host: 'www.abc.com:90',
+      hostname: 'www.abc.com',
+      port: '90',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: '?asearch',
+      origin: 'http://www.abc.com:90'
+    },
+
+    { url: '/foo#bar',
+      base: 'www.test.org',
+      error: true,
+    },
+    { url: '/foo#bar',
+      base: null,
+      error: true,
+    },
+    { url: '/foo#bar',
+      base: 42,
+      error: true,
+    },
+    { url: 'ftp://ftp.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'ftp:',
+    },
+    { url: 'file:///tmp/file',
+      base: undefined,
+      error: false,
+      protocol: 'file:',
+    },
+    { url: 'gopher://gopher.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'gopher:',
+    },
+    { url: 'ws://ws.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'ws:',
+    },
+    { url: 'wss://ws.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'wss:',
+    },
+    { url: 'foo://foo.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'foo:',
+    },
+  ];
+
+  while(tests.length) {
+    var test = tests.shift();
+
+    var error = false;
+    var url;
+    try {
+      if (test.base) {
+        url = new URL(test.url, test.base);
+      } else {
+        url = new URL(test.url);
+      }
+    } catch(e) {
+      error = true;
+    }
+
+    is(test.error, error, "Error creating URL");
+    if (test.error) {
+      continue;
+    }
+
+    if ('href' in test) is(url.href, test.href, "href");
+    if ('origin' in test) is(url.origin, test.origin, "origin");
+    if ('protocol' in test) is(url.protocol, test.protocol, "protocol");
+    if ('username' in test) is(url.username, test.username, "username");
+    if ('password' in test) is(url.password, test.password, "password");
+    if ('host' in test) is(url.host, test.host, "host");
+    if ('hostname' in test) is(url.hostname, test.hostname, "hostname");
+    if ('port' in test) is(url.port, test.port, "port");
+    if ('pathname' in test) is(url.pathname, test.pathname, "pathname");
+    if ('search' in test) is(url.search, test.search, "search");
+    if ('hash' in test) is(url.hash, test.hash, "hash");
+
+    url = new URL('https://www.example.net/what#foo?bar');
+    ok(url, "Url exists!");
+
+    if ('href' in test) url.href = test.href;
+    if ('protocol' in test) url.protocol = test.protocol;
+    if ('username' in test && test.username) url.username = test.username;
+    if ('password' in test && test.password) url.password = test.password;
+    if ('host' in test) url.host = test.host;
+    if ('hostname' in test) url.hostname = test.hostname;
+    if ('port' in test) url.port = test.port;
+    if ('pathname' in test) url.pathname = test.pathname;
+    if ('search' in test) url.search = test.search;
+    if ('hash' in test) url.hash = test.hash;
+
+    if ('href' in test) is(url.href, test.href, "href");
+    if ('origin' in test) is(url.origin, test.origin, "origin");
+    if ('protocol' in test) is(url.protocol, test.protocol, "protocol");
+    if ('username' in test) is(url.username, test.username, "username");
+    if ('password' in test) is(url.password, test.password, "password");
+    if ('host' in test) is(url.host, test.host, "host");
+    if ('hostname' in test) is(test.hostname, url.hostname, "hostname");
+    if ('port' in test) is(test.port, url.port, "port");
+    if ('pathname' in test) is(test.pathname, url.pathname, "pathname");
+    if ('search' in test) is(test.search, url.search, "search");
+    if ('hash' in test) is(test.hash, url.hash, "hash");
+  }
+
+  </script>
+</body>
+</html>

dom/bindings/Bindings.conf

@@ -1232,12 +1232,12 @@ DOMInterfaces = {
 },
 
 'URL' : [{
-    'concrete': False,
+    'wrapperCache' : False,
+    'nativeOwnership': 'refcounted',
 },
 {
     'implicitJSContext': [ 'createObjectURL', 'revokeObjectURL' ],
     'workers': True,
-    'concrete': False,
 }],
 
 'VTTCue': {

dom/bindings/test/Makefile.in

@@ -75,7 +75,6 @@ MOCHITEST_FILES := \
   test_ByteString.html \
   test_exception_messages.html \
   test_bug707564.html \
-  test_bug907548.html \
   test_defineProperty.html \
   $(NULL)
 

dom/bindings/test/test_bug907548.html

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=907548
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 907548</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  /** Test for Bug 907548 **/
-  ok(!URL.prototype,
-     "URL.prototype should be undefined unless the URL API is implemented");
-
-
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907548">Mozilla Bug 907548</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>

dom/webidl/URL.webidl

@@ -4,6 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * The origins of this IDL file are
+ * http://url.spec.whatwg.org/#api
  * http://dev.w3.org/2006/webapi/FileAPI/#creating-revoking
  * http://dev.w3.org/2011/webrtc/editor/getusermedia.html#url
  *
@@ -11,7 +12,14 @@
  * liability, trademark and document use rules apply.
  */
 
+// [Constructor(DOMString url, optional (URL or DOMString) base = "about:blank")]
+[Constructor(DOMString url, URL base),
+ Constructor(DOMString url, optional DOMString base = "about:blank")]
 interface URL {
+};
+URL implements URLUtils;
+
+partial interface URL {
   [Throws]
   static DOMString? createObjectURL(Blob blob, optional objectURLOptions options);
   [Throws]

dom/workers/URL.cpp

@@ -225,6 +225,129 @@ public:
   }
 };
 
+// static
+URL*
+URL::Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+                 URL& aBase, ErrorResult& aRv)
+{
+  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
+  return nullptr;
+}
+
+// static
+URL*
+URL::Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+                 const nsAString& aBase, ErrorResult& aRv)
+{
+  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
+  return nullptr;
+}
+
+void
+URL::GetHref(nsString& aHref) const
+{
+}
+
+void
+URL::SetHref(const nsAString& aHref, ErrorResult& aRv)
+{
+}
+
+void
+URL::GetOrigin(nsString& aOrigin) const
+{
+}
+
+void
+URL::GetProtocol(nsString& aProtocol) const
+{
+}
+
+void
+URL::SetProtocol(const nsAString& aProtocol)
+{
+}
+
+void
+URL::GetUsername(nsString& aUsername) const
+{
+}
+
+void
+URL::SetUsername(const nsAString& aUsername)
+{
+}
+
+void
+URL::GetPassword(nsString& aPassword) const
+{
+}
+
+void
+URL::SetPassword(const nsAString& aPassword)
+{
+}
+
+void
+URL::GetHost(nsString& aHost) const
+{
+}
+
+void
+URL::SetHost(const nsAString& aHost)
+{
+}
+
+void
+URL::GetHostname(nsString& aHostname) const
+{
+}
+
+void
+URL::SetHostname(const nsAString& aHostname)
+{
+}
+
+void
+URL::GetPort(nsString& aPort) const
+{
+}
+
+void
+URL::SetPort(const nsAString& aPort)
+{
+}
+
+void
+URL::GetPathname(nsString& aPathname) const
+{
+}
+
+void
+URL::SetPathname(const nsAString& aPathname)
+{
+}
+
+void
+URL::GetSearch(nsString& aSearch) const
+{
+}
+
+void
+URL::SetSearch(const nsAString& aSearch)
+{
+}
+
+void
+URL::GetHash(nsString& aHash) const
+{
+}
+
+void
+URL::SetHash(const nsAString& aHash)
+{
+}
+
 // static
 void
 URL::CreateObjectURL(const GlobalObject& aGlobal, JSObject* aBlob,

dom/workers/URL.h

@@ -16,6 +16,13 @@ BEGIN_WORKERS_NAMESPACE
 class URL : public EventTarget
 {
 public: // Methods for WebIDL
+  static URL*
+  Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+              URL& aBase, ErrorResult& aRv);
+  static URL*
+  Constructor(const GlobalObject& aGlobal, const nsAString& aUrl,
+              const nsAString& aBase, ErrorResult& aRv);
+
   static void
   CreateObjectURL(const GlobalObject& aGlobal,
                   JSObject* aArg, const objectURLOptions& aOptions,
@@ -28,6 +35,56 @@ public: // Methods for WebIDL
 
   static void
   RevokeObjectURL(const GlobalObject& aGlobal, const nsAString& aUrl);
+
+  void GetHref(nsString& aHref) const;
+
+  void SetHref(const nsAString& aHref, ErrorResult& aRv);
+
+  void GetOrigin(nsString& aOrigin) const;
+
+  void GetProtocol(nsString& aProtocol) const;
+
+  void SetProtocol(const nsAString& aProtocol);
+
+  void GetUsername(nsString& aUsername) const;
+
+  void SetUsername(const nsAString& aUsername);
+
+  void GetPassword(nsString& aPassword) const;
+
+  void SetPassword(const nsAString& aPassword);
+
+  void GetHost(nsString& aHost) const;
+
+  void SetHost(const nsAString& aHost);
+
+  void GetHostname(nsString& aHostname) const;
+
+  void SetHostname(const nsAString& aHostname);
+
+  void GetPort(nsString& aPort) const;
+
+  void SetPort(const nsAString& aPort);
+
+  void GetPathname(nsString& aPathname) const;
+
+  void SetPathname(const nsAString& aPathname);
+
+  void GetSearch(nsString& aSearch) const;
+
+  void SetSearch(const nsAString& aSearch);
+
+  void GetHash(nsString& aHost) const;
+
+  void SetHash(const nsAString& aHash);
+
+private:
+  mozilla::dom::URL* GetURL() const
+  {
+    return mURL;
+  }
+
+  nsRefPtr<mozilla::dom::URL> mURL;
 };
 
 END_WORKERS_NAMESPACE

netwerk/base/src/nsStandardURL.cpp

@@ -1409,13 +1409,39 @@ nsStandardURL::SetPassword(const nsACString &input)
 }
 
 NS_IMETHODIMP
-nsStandardURL::SetHostPort(const nsACString &value)
+nsStandardURL::SetHostPort(const nsACString &aValue)
 {
     ENSURE_MUTABLE();
 
-    // XXX needs implementation!!
-    NS_NOTREACHED("not implemented");
-    return NS_ERROR_NOT_IMPLEMENTED;
+  // We cannot simply call nsIURI::SetHost because that would treat the name as
+  // an IPv6 address (like http:://[server:443]/).  We also cannot call
+  // nsIURI::SetHostPort because that isn't implemented.  Sadfaces.
+
+  // First set the hostname.
+  nsACString::const_iterator start, end;
+  aValue.BeginReading(start);
+  aValue.EndReading(end);
+  nsACString::const_iterator iter(start);
+  FindCharInReadable(':', iter, end);
+
+  nsresult rv = SetHost(Substring(start, iter));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Also set the port if needed.
+  if (iter != end) {
+    iter++;
+    if (iter != end) {
+      nsCString portStr(Substring(iter, end));
+      nsresult rv;
+      int32_t port = portStr.ToInteger(&rv);
+      if (NS_SUCCEEDED(rv)) {
+        rv = SetPort(port);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+    }
+  }
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP