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

Use internal mutability for FormData.

Browse source
This commit is contained in:
Ms2ger 2014-06-10 19:12:16 +02:00
parent 23a6b6823b
commit be375de91f
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/components/script/dom/formdata.rs
View file

@ -2,15 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::bindings::error::{Fallible};
use dom::bindings::codegen::Bindings::FormDataBinding; use dom::bindings::codegen::Bindings::FormDataBinding;
use dom::bindings::error::{Fallible};
use dom::bindings::js::{JS, JSRef, Temporary, OptionalUnrootable}; use dom::bindings::js::{JS, JSRef, Temporary, OptionalUnrootable};
use dom::bindings::trace::Traceable;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::blob::Blob; use dom::blob::Blob;
use dom::htmlformelement::HTMLFormElement; use dom::htmlformelement::HTMLFormElement;
use dom::window::Window; use dom::window::Window;
use servo_util::str::DOMString; use servo_util::str::DOMString;
use collections::hashmap::HashMap; use collections::hashmap::HashMap;
use std::cell::RefCell;
#[deriving(Encodable)] #[deriving(Encodable)]
pub enum FormDatum { pub enum FormDatum {
@ -20,7 +22,7 @@ pub enum FormDatum {
#[deriving(Encodable)] #[deriving(Encodable)]
pub struct FormData { pub struct FormData {
pub data: HashMap<DOMString, FormDatum>, pub data: Traceable<RefCell<HashMap<DOMString, FormDatum>>>,
pub reflector_: Reflector, pub reflector_: Reflector,
pub window: JS<Window>, pub window: JS<Window>,
pub form: Option<JS<HTMLFormElement>> pub form: Option<JS<HTMLFormElement>>
@ -29,7 +31,7 @@ pub struct FormData {
impl FormData { impl FormData {
pub fn new_inherited(form: Option<JSRef<HTMLFormElement>>, window: &JSRef<Window>) -> FormData { pub fn new_inherited(form: Option<JSRef<HTMLFormElement>>, window: &JSRef<Window>) -> FormData {
FormData { FormData {
data: HashMap::new(), data: Traceable::new(RefCell::new(HashMap::new())),
reflector_: Reflector::new(), reflector_: Reflector::new(),
window: window.unrooted(), window: window.unrooted(),
form: form.unrooted(), form: form.unrooted(),
@ -46,21 +48,21 @@ impl FormData {
} }
pub trait FormDataMethods { pub trait FormDataMethods {
fn Append(&mut self, name: DOMString, value: &JSRef<Blob>, filename: Option<DOMString>); fn Append(&self, name: DOMString, value: &JSRef<Blob>, filename: Option<DOMString>);
fn Append_(&mut self, name: DOMString, value: DOMString); fn Append_(&self, name: DOMString, value: DOMString);
} }
impl<'a> FormDataMethods for JSRef<'a, FormData> { impl<'a> FormDataMethods for JSRef<'a, FormData> {
fn Append(&mut self, name: DOMString, value: &JSRef<Blob>, filename: Option<DOMString>) { fn Append(&self, name: DOMString, value: &JSRef<Blob>, filename: Option<DOMString>) {
let blob = BlobData { let blob = BlobData {
blob: value.unrooted(), blob: value.unrooted(),
name: filename.unwrap_or("default".to_string()) name: filename.unwrap_or("default".to_string())
}; };
self.data.insert(name.clone(), blob); self.data.deref().borrow_mut().insert(name.clone(), blob);
} }
fn Append_(&mut self, name: DOMString, value: DOMString) { fn Append_(&self, name: DOMString, value: DOMString) {
self.data.insert(name, StringData(value)); self.data.deref().borrow_mut().insert(name, StringData(value));
} }
} }