Implement WorkerGlobalScope.location.

src/components/script/dom/webidls/URLUtilsReadOnly.webidl

@@ -0,0 +1,23 @@
+/* -*- 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/. */
+
+// http://url.spec.whatwg.org/#urlutilsreadonly
+[NoInterfaceObject/*,
+ Exposed=(Window,Worker)*/]
+interface URLUtilsReadOnly {
+  //stringifier readonly attribute ScalarValueString href;
+  readonly attribute DOMString href;
+  //readonly attribute ScalarValueString origin;
+
+  //readonly attribute ScalarValueString protocol;
+  //readonly attribute ScalarValueString host;
+  //readonly attribute ScalarValueString hostname;
+  //readonly attribute ScalarValueString port;
+  //readonly attribute ScalarValueString pathname;
+  //readonly attribute ScalarValueString search;
+  readonly attribute DOMString search;
+  //readonly attribute ScalarValueString hash;
+  readonly attribute DOMString hash;
+};

src/components/script/dom/webidls/WorkerGlobalScope.webidl

@@ -6,7 +6,7 @@
 //[Exposed=Worker]
 interface WorkerGlobalScope : EventTarget {
   readonly attribute WorkerGlobalScope self;
-  //readonly attribute WorkerLocation location;
+  readonly attribute WorkerLocation location;
 
   //void close();
   //         attribute OnErrorEventHandler onerror;

src/components/script/dom/webidls/WorkerLocation.webidl

@@ -0,0 +1,9 @@
+/* -*- 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/. */
+
+// http://www.whatwg.org/html/#worker-locations
+//[Exposed=Worker]
+interface WorkerLocation { };
+WorkerLocation implements URLUtilsReadOnly;

src/components/script/dom/workerglobalscope.rs

@@ -9,6 +9,7 @@ use dom::bindings::js::{JS, JSRef, Temporary, OptionalSettable};
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::console::Console;
 use dom::eventtarget::{EventTarget, WorkerGlobalScopeTypeId};
+use dom::workerlocation::WorkerLocation;
 use dom::workernavigator::WorkerNavigator;
 use script_task::ScriptChan;
 
@@ -33,6 +34,7 @@ pub struct WorkerGlobalScope {
     js_context: Untraceable<Rc<Cx>>,
     resource_task: Untraceable<ResourceTask>,
     script_chan: ScriptChan,
+    location: Cell<Option<JS<WorkerLocation>>>,
     navigator: Cell<Option<JS<WorkerNavigator>>>,
     console: Cell<Option<JS<Console>>>,
 }
@@ -49,6 +51,7 @@ impl WorkerGlobalScope {
             js_context: Untraceable::new(cx),
             resource_task: Untraceable::new(resource_task),
             script_chan: script_chan,
+            location: Cell::new(None),
             navigator: Cell::new(None),
             console: Cell::new(None),
         }
@@ -76,6 +79,14 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
         Temporary::from_rooted(self)
     }
 
+    fn Location(&self) -> Temporary<WorkerLocation> {
+        if self.location.get().is_none() {
+            let location = WorkerLocation::new(self, self.worker_url.clone());
+            self.location.assign(Some(location));
+        }
+        Temporary::new(self.location.get().get_ref().clone())
+    }
+
     fn Navigator(&self) -> Temporary<WorkerNavigator> {
         if self.navigator.get().is_none() {
             let navigator = WorkerNavigator::new(self);

src/components/script/dom/workerlocation.rs

@@ -0,0 +1,64 @@
+/* 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/. */
+
+use dom::bindings::codegen::Bindings::WorkerLocationBinding;
+use dom::bindings::codegen::Bindings::WorkerLocationBinding::WorkerLocationMethods;
+use dom::bindings::js::{JSRef, Temporary};
+use dom::bindings::global::Worker;
+use dom::bindings::trace::Untraceable;
+use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
+use dom::workerglobalscope::WorkerGlobalScope;
+
+use servo_util::str::DOMString;
+
+use url::Url;
+
+#[deriving(Encodable)]
+pub struct WorkerLocation {
+    reflector_: Reflector,
+    url: Untraceable<Url>,
+}
+
+impl WorkerLocation {
+    pub fn new_inherited(url: Url) -> WorkerLocation {
+        WorkerLocation {
+            reflector_: Reflector::new(),
+            url: Untraceable::new(url),
+        }
+    }
+
+    pub fn new(global: &JSRef<WorkerGlobalScope>, url: Url) -> Temporary<WorkerLocation> {
+        reflect_dom_object(box WorkerLocation::new_inherited(url),
+                           &Worker(*global),
+                           WorkerLocationBinding::Wrap)
+    }
+}
+
+impl<'a> WorkerLocationMethods for JSRef<'a, WorkerLocation> {
+    fn Href(&self) -> DOMString {
+        self.url.serialize()
+    }
+
+    fn Search(&self) -> DOMString {
+        match self.url.query {
+            None => "".to_string(),
+            Some(ref query) if query.as_slice() == "" => "".to_string(),
+            Some(ref query) => "?".to_string().append(query.as_slice())
+        }
+    }
+
+    fn Hash(&self) -> DOMString {
+        match self.url.fragment {
+            None => "".to_string(),
+            Some(ref hash) if hash.as_slice() == "" => "".to_string(),
+            Some(ref hash) => "#".to_string().append(hash.as_slice())
+        }
+    }
+}
+
+impl Reflectable for WorkerLocation {
+    fn reflector<'a>(&'a self) -> &'a Reflector {
+        &self.reflector_
+    }
+}

src/components/script/script.rs

@@ -191,6 +191,7 @@ pub mod dom {
     pub mod window;
     pub mod worker;
     pub mod workerglobalscope;
+    pub mod workerlocation;
     pub mod workernavigator;
     pub mod xmlhttprequest;
     pub mod xmlhttprequesteventtarget;

src/test/content/test_interfaces.html

@@ -163,6 +163,7 @@ var interfaceNamesInGlobalScope = [
   "Window",
   "Worker",
   "WorkerGlobalScope", // #2823
+  "WorkerLocation", // #2823
   "WorkerNavigator", // #2823
   "XMLHttpRequest",
   "XMLHttpRequestUpload",

src/test/wpt/metadata/workers/WorkerLocation.htm.ini

@@ -1,6 +1,5 @@
 [WorkerLocation.htm]
   type: testharness
-  expected: TIMEOUT
   [Test Description: A WorkerLocation object represents an absolute URL set at its creation.]
-    expected: NOTRUN
+    expected: FAIL
 

src/test/wpt/metadata/workers/WorkerLocation_hash.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_hash.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation.hash returns the current fragment identifier in the underlying URL.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_hash_encoding.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_hash_encoding.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation.hash returns \'#question%3f\' from input \'http://example.com/carrot#question%3f\']
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_hash_nonexist.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_hash_nonexist.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation hash attribute returns an empty string when there is no <query> component in input URL.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_host.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_host.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation host attribute returns the current host and port (if it\'s not the default port) in the underlying URL. The port part, if omitted, will be assumed to be the current scheme\'s default port.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_hostname.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_hostname.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation hostname attribute returns the current host in the underlying URL.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_href.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_href.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation href attribute must return the absolute URL that the WorkerLocation object represents.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_port.htm.ini

@@ -1,6 +1,5 @@
 [WorkerLocation_port.htm]
   type: testharness
-  expected: TIMEOUT
   [Test Description: WorkerLocation port attribute returns the current port in the underlying URL.]
-    expected: NOTRUN
+    expected: FAIL
 

src/test/wpt/metadata/workers/WorkerLocation_protocol.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_protocol.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation protocol attribute returns the current scheme of the underlying URL.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_search.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_search.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation search attribute returns the current query component in the underlying URL.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_search_empty.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_search_empty.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation.search Getter Condition: input is a hierarchical URL, and contained a <query> component (possibly an empty one).]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_search_fragment.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_search_fragment.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation.search - The (empty) <fragment> component is not part of the <query> component for input URL \'http://example.com/?test#\']
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/WorkerLocation_search_nonexist.htm.ini

@@ -1,6 +0,0 @@
-[WorkerLocation_search_nonexist.htm]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: WorkerLocation.search returns an empty string when there is no <query> component in input URL.]
-    expected: NOTRUN
-

src/test/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/members.html.ini

@@ -1,6 +0,0 @@
-[members.html]
-  type: testharness
-  expected: TIMEOUT
-  [members of WorkerLocation]
-    expected: TIMEOUT
-

src/test/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/returns-same-object.html.ini

@@ -1,6 +0,0 @@
-[returns-same-object.html]
-  type: testharness
-  expected: TIMEOUT
-  [location === location]
-    expected: TIMEOUT
-

src/test/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/setting-members.html.ini

@@ -1,6 +1,5 @@
 [setting-members.html]
   type: testharness
-  expected: TIMEOUT
   [setting members of WorkerLocation]
-    expected: TIMEOUT
+    expected: FAIL
 

src/test/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/worker-separate-file.html.ini

@@ -1,6 +1,5 @@
 [worker-separate-file.html]
   type: testharness
-  expected: TIMEOUT
   [location with a worker in separate file]
-    expected: TIMEOUT
+    expected: FAIL
 

src/test/wpt/metadata/workers/semantics/multiple-workers/003.html.ini

@@ -1,6 +0,0 @@
-[003.html]
-  type: testharness
-  expected: TIMEOUT
-  [creating 3 nested dedicated workers]
-    expected: TIMEOUT
-