mirror of
https://github.com/servo/servo.git
synced 2025-07-23 15:23:42 +01:00
Remove Untraceable from workerlocation.rs
This commit is contained in:
parent
0fdee70cbf
commit
87df84fcf8
1 changed files with 5 additions and 6 deletions
|
@ -6,7 +6,6 @@ use dom::bindings::codegen::Bindings::WorkerLocationBinding;
|
||||||
use dom::bindings::codegen::Bindings::WorkerLocationBinding::WorkerLocationMethods;
|
use dom::bindings::codegen::Bindings::WorkerLocationBinding::WorkerLocationMethods;
|
||||||
use dom::bindings::js::{JSRef, Temporary};
|
use dom::bindings::js::{JSRef, Temporary};
|
||||||
use dom::bindings::global::Worker;
|
use dom::bindings::global::Worker;
|
||||||
use dom::bindings::trace::Untraceable;
|
|
||||||
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
|
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
|
||||||
use dom::urlhelper::UrlHelper;
|
use dom::urlhelper::UrlHelper;
|
||||||
use dom::workerglobalscope::WorkerGlobalScope;
|
use dom::workerglobalscope::WorkerGlobalScope;
|
||||||
|
@ -19,14 +18,14 @@ use url::Url;
|
||||||
#[must_root]
|
#[must_root]
|
||||||
pub struct WorkerLocation {
|
pub struct WorkerLocation {
|
||||||
reflector_: Reflector,
|
reflector_: Reflector,
|
||||||
url: Untraceable<Url>,
|
url: Url,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl WorkerLocation {
|
impl WorkerLocation {
|
||||||
fn new_inherited(url: Url) -> WorkerLocation {
|
fn new_inherited(url: Url) -> WorkerLocation {
|
||||||
WorkerLocation {
|
WorkerLocation {
|
||||||
reflector_: Reflector::new(),
|
reflector_: Reflector::new(),
|
||||||
url: Untraceable::new(url),
|
url: url,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,15 +38,15 @@ impl WorkerLocation {
|
||||||
|
|
||||||
impl<'a> WorkerLocationMethods for JSRef<'a, WorkerLocation> {
|
impl<'a> WorkerLocationMethods for JSRef<'a, WorkerLocation> {
|
||||||
fn Href(self) -> DOMString {
|
fn Href(self) -> DOMString {
|
||||||
UrlHelper::Href(self.url.deref())
|
UrlHelper::Href(&self.url)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn Search(self) -> DOMString {
|
fn Search(self) -> DOMString {
|
||||||
UrlHelper::Search(self.url.deref())
|
UrlHelper::Search(&self.url)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn Hash(self) -> DOMString {
|
fn Hash(self) -> DOMString {
|
||||||
UrlHelper::Hash(self.url.deref())
|
UrlHelper::Hash(&self.url)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue