From 87df84fcf8348d873745832ceb0c6ffae84c385e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 29 Sep 2014 05:26:44 +0530 Subject: [PATCH] Remove Untraceable from workerlocation.rs --- components/script/dom/workerlocation.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index c612e49e04f..1eaa40829da 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -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; @@ -19,14 +18,14 @@ use url::Url; #[must_root] pub struct WorkerLocation { reflector_: Reflector, - url: Untraceable, + url: Url, } impl WorkerLocation { fn new_inherited(url: Url) -> WorkerLocation { WorkerLocation { reflector_: Reflector::new(), - url: Untraceable::new(url), + url: url, } } @@ -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) } }