Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove Traceable from urlsearchparams.rs

Browse source
This commit is contained in:
Manish Goregaokar 2014-09-29 05:20:06 +05:30
parent 1d2c15e657
commit 16d12d0a82
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/script/dom/urlsearchparams.rs
View file

@ -8,7 +8,6 @@ use dom::bindings::codegen::UnionTypes::StringOrURLSearchParams::{StringOrURLSea
use dom::bindings::error::{Fallible}; use dom::bindings::error::{Fallible};
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::js::{JSRef, Temporary};
use dom::bindings::trace::Traceable;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use servo_util::str::DOMString; use servo_util::str::DOMString;
@ -24,14 +23,14 @@ use std::ascii::OwnedStrAsciiExt;
#[jstraceable] #[jstraceable]
#[must_root] #[must_root]
pub struct URLSearchParams { pub struct URLSearchParams {
data: Traceable<RefCell<HashMap<DOMString, Vec<DOMString>>>>, data: RefCell<HashMap<DOMString, Vec<DOMString>>>,
reflector_: Reflector, reflector_: Reflector,
} }
impl URLSearchParams { impl URLSearchParams {
fn new_inherited() -> URLSearchParams { fn new_inherited() -> URLSearchParams {
URLSearchParams { URLSearchParams {
data: Traceable::new(RefCell::new(HashMap::new())), data: RefCell::new(HashMap::new()),
reflector_: Reflector::new(), reflector_: Reflector::new(),
} }
} }
@ -51,8 +50,8 @@ impl URLSearchParams {
}, },
Some(eURLSearchParams(u)) => { Some(eURLSearchParams(u)) => {
let u = u.root(); let u = u.root();
let mut map = usp.deref().data.deref().borrow_mut(); let mut map = usp.deref().data.borrow_mut();
*map = u.data.deref().borrow().clone(); *map = u.data.borrow().clone();
}, },
None => {} None => {}
} }
@ -62,26 +61,26 @@ impl URLSearchParams {
impl<'a> URLSearchParamsMethods for JSRef<'a, URLSearchParams> { impl<'a> URLSearchParamsMethods for JSRef<'a, URLSearchParams> {
fn Append(self, name: DOMString, value: DOMString) { fn Append(self, name: DOMString, value: DOMString) {
self.data.deref().borrow_mut().insert_or_update_with(name, vec!(value.clone()), self.data.borrow_mut().insert_or_update_with(name, vec!(value.clone()),
|_k, v| v.push(value.clone())); |_k, v| v.push(value.clone()));
self.update_steps(); self.update_steps();
} }
fn Delete(self, name: DOMString) { fn Delete(self, name: DOMString) {
self.data.deref().borrow_mut().remove(&name); self.data.borrow_mut().remove(&name);
self.update_steps(); self.update_steps();
} }
fn Get(self, name: DOMString) -> Option<DOMString> { fn Get(self, name: DOMString) -> Option<DOMString> {
self.data.deref().borrow().find_equiv(&name).map(|v| v[0].clone()) self.data.borrow().find_equiv(&name).map(|v| v[0].clone())
} }
fn Has(self, name: DOMString) -> bool { fn Has(self, name: DOMString) -> bool {
self.data.deref().borrow().contains_key_equiv(&name) self.data.borrow().contains_key_equiv(&name)
} }
fn Set(self, name: DOMString, value: DOMString) { fn Set(self, name: DOMString, value: DOMString) {
self.data.deref().borrow_mut().insert(name, vec!(value)); self.data.borrow_mut().insert(name, vec!(value));
self.update_steps(); self.update_steps();
} }
} }
@ -129,7 +128,7 @@ impl URLSearchParamsHelpers for URLSearchParams {
let encoding = encoding.unwrap_or(UTF_8 as EncodingRef); let encoding = encoding.unwrap_or(UTF_8 as EncodingRef);
let mut buf = vec!(); let mut buf = vec!();
let mut first_pair = true; let mut first_pair = true;
for (k, v) in self.data.deref().borrow().iter() { for (k, v) in self.data.borrow().iter() {
let name = serialize_string(k, encoding); let name = serialize_string(k, encoding);
for val in v.iter() { for val in v.iter() {
let value = serialize_string(val, encoding); let value = serialize_string(val, encoding);