auto merge of #1270 : evilpie/servo/url, r=jdm

I wasn't sure how to store @window in Location, so I just made it use @Page for now. I was going to implement stringifier, but sadly some of the webidl stuff is like 1 year out of sync.

4 files changed, 58 insertions, 2 deletions

diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index 4ced1397f02..18665606bba 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -280,6 +280,9 @@ DOMInterfaces = {
     'workers': True,
 }],
 
+'Location': {
+},
+
 'MozChannel': [
 {
     'nativeType': 'nsIChannel',
diff --git a/src/components/script/dom/bindings/codegen/Location.webidl b/src/components/script/dom/bindings/codegen/Location.webidl
new file mode 100644
index 00000000000..33d4c2e0d30
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/Location.webidl
@@ -0,0 +1,21 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * http://www.whatwg.org/specs/web-apps/current-work/#the-location-interface
+ *
+ * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
+ * Opera Software ASA. You are granted a license to use, reproduce
+ * and create derivative works of this document.
+ */
+
+// No support for [Unforgeable] on interfaces yet
+//[Unforgeable]
+interface Location {
+  void assign(DOMString url);
+  void replace(DOMString url);
+  void reload();
+};
+Location implements URLUtils;
diff --git a/src/components/script/dom/bindings/codegen/URLUtils.webidl b/src/components/script/dom/bindings/codegen/URLUtils.webidl
new file mode 100644
index 00000000000..f65514ca53d
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/URLUtils.webidl
@@ -0,0 +1,32 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * http://url.spec.whatwg.org/#urlutils
+ *
+ * To the extent possible under law, the editors have waived all copyright
+ * and related or neighboring rights to this work. In addition, as of 17
+ * February 2013, the editors have made this specification available under
+ * the Open Web Foundation Agreement Version 1.0, which is available at
+ * http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0.
+ */
+
+[NoInterfaceObject]
+interface URLUtils {
+  [SetterThrows]
+  /* stringifier */ attribute DOMString href;
+  readonly attribute DOMString origin;
+
+           attribute DOMString protocol;
+           attribute DOMString username;
+           attribute DOMString password;
+           attribute DOMString host;
+           attribute DOMString hostname;
+           attribute DOMString port;
+           attribute DOMString pathname;
+           attribute DOMString search;
+           // attribute URLQuery? query;
+           attribute DOMString hash;
+};
diff --git a/src/components/script/dom/bindings/codegen/Window.webidl b/src/components/script/dom/bindings/codegen/Window.webidl
index 59ea26308e3..a2f541e61f2 100644
--- a/src/components/script/dom/bindings/codegen/Window.webidl
+++ b/src/components/script/dom/bindings/codegen/Window.webidl
@@ -14,8 +14,8 @@
     [Replaceable] readonly attribute WindowProxy self;*/
   [Unforgeable] readonly attribute Document document;
            attribute DOMString name; 
-  /*[PutForwards=href, Unforgeable] readonly attribute Location location;
-  readonly attribute History history;
+  /* [PutForwards=href, Unforgeable] */ readonly attribute Location location;
+  /* readonly attribute History history;
   [Replaceable] readonly attribute BarProp locationbar;
   [Replaceable] readonly attribute BarProp menubar;
   [Replaceable] readonly attribute BarProp personalbar;