aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/workerlocation.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-03-13 14:30:49 -0600
committerbors-servo <metajack+bors@gmail.com>2015-03-13 14:30:49 -0600
commit19cd87aefc24fa153fa013b5f96ae46de9a427fd (patch)
treecd851e0b8b82b7889bb1417604d9936f95fcc461 /components/script/dom/workerlocation.rs
parent2382d71242b1f9fe6385b64436f3b18f8f0939bb (diff)
parent2345f5461bf847fa0d7840fde04da13df4a36d51 (diff)
downloadservo-19cd87aefc24fa153fa013b5f96ae46de9a427fd.tar.gz
servo-19cd87aefc24fa153fa013b5f96ae46de9a427fd.zip
auto merge of #5208 : Ms2ger/servo/USVString, r=jdm
Diffstat (limited to 'components/script/dom/workerlocation.rs')
-rw-r--r--components/script/dom/workerlocation.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs
index 787552c84a0..1f176e2c7d9 100644
--- a/components/script/dom/workerlocation.rs
+++ b/components/script/dom/workerlocation.rs
@@ -6,12 +6,11 @@ use dom::bindings::codegen::Bindings::WorkerLocationBinding;
use dom::bindings::codegen::Bindings::WorkerLocationBinding::WorkerLocationMethods;
use dom::bindings::js::{JSRef, Temporary};
use dom::bindings::global::GlobalRef;
+use dom::bindings::str::USVString;
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::urlhelper::UrlHelper;
use dom::workerglobalscope::WorkerGlobalScope;
-use util::str::DOMString;
-
use url::Url;
#[dom_struct]
@@ -36,15 +35,15 @@ impl WorkerLocation {
}
impl<'a> WorkerLocationMethods for JSRef<'a, WorkerLocation> {
- fn Href(self) -> DOMString {
+ fn Href(self) -> USVString {
UrlHelper::Href(&self.url)
}
- fn Search(self) -> DOMString {
+ fn Search(self) -> USVString {
UrlHelper::Search(&self.url)
}
- fn Hash(self) -> DOMString {
+ fn Hash(self) -> USVString {
UrlHelper::Hash(&self.url)
}
}