Skip to content

Commit

Permalink
Remove Untraceable from workerlocation.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
Manishearth committed Oct 5, 2014
1 parent 0fdee70 commit 87df84f
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions components/script/dom/workerlocation.rs
Expand Up @@ -6,7 +6,6 @@ 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::urlhelper::UrlHelper;
use dom::workerglobalscope::WorkerGlobalScope;
Expand All @@ -19,14 +18,14 @@ use url::Url;
#[must_root]
pub struct WorkerLocation {
reflector_: Reflector,
url: Untraceable<Url>,
url: Url,
}

impl WorkerLocation {
fn new_inherited(url: Url) -> WorkerLocation {
WorkerLocation {
reflector_: Reflector::new(),
url: Untraceable::new(url),
url: url,
}
}

Expand All @@ -39,15 +38,15 @@ impl WorkerLocation {

impl<'a> WorkerLocationMethods for JSRef<'a, WorkerLocation> {
fn Href(self) -> DOMString {
UrlHelper::Href(self.url.deref())
UrlHelper::Href(&self.url)
}

fn Search(self) -> DOMString {
UrlHelper::Search(self.url.deref())
UrlHelper::Search(&self.url)
}

fn Hash(self) -> DOMString {
UrlHelper::Hash(self.url.deref())
UrlHelper::Hash(&self.url)
}
}

Expand Down

0 comments on commit 87df84f

Please sign in to comment.