forked from mirrors/gecko-dev
> Here it is. > > ~~There's two major things that are unfinished here:~~ > - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done. > - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done. > > I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location. > > Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later. > > Generational GC works. SM doesn't work without it. > > The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`. > > Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it. > > `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`. > > `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case. > > This has been tested with the following zeal settings: > > GC after every allocation > JS_GC_ZEAL=2,1 > > GC after every 100 allocations (important for catching use-after-free bugs) > JS_GC_ZEAL=2,100 > > Verify pre barriers > JS_GC_ZEAL=4,1 > > Verify post barriers > JS_GC_ZEAL=11,1 Source-Repo: https://github.com/servo/servo Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
128 lines
4.4 KiB
Rust
128 lines
4.4 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
use dom::bindings::cell::DOMRefCell;
|
|
use dom::bindings::codegen::Bindings::FormDataBinding;
|
|
use dom::bindings::codegen::Bindings::FormDataBinding::FormDataMethods;
|
|
use dom::bindings::codegen::InheritTypes::FileCast;
|
|
use dom::bindings::codegen::UnionTypes::FileOrString;
|
|
use dom::bindings::codegen::UnionTypes::FileOrString::{eFile, eString};
|
|
use dom::bindings::error::{Fallible};
|
|
use dom::bindings::global::{GlobalRef, GlobalField};
|
|
use dom::bindings::js::{JS, Root};
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
use dom::blob::Blob;
|
|
use dom::file::File;
|
|
use dom::htmlformelement::HTMLFormElement;
|
|
use util::str::DOMString;
|
|
|
|
use std::borrow::ToOwned;
|
|
use std::collections::HashMap;
|
|
use std::collections::hash_map::Entry::{Occupied, Vacant};
|
|
|
|
#[derive(Clone)]
|
|
#[jstraceable]
|
|
#[must_root]
|
|
pub enum FormDatum {
|
|
StringData(DOMString),
|
|
FileData(JS<File>)
|
|
}
|
|
|
|
#[dom_struct]
|
|
pub struct FormData {
|
|
reflector_: Reflector,
|
|
data: DOMRefCell<HashMap<DOMString, Vec<FormDatum>>>,
|
|
global: GlobalField,
|
|
form: Option<JS<HTMLFormElement>>
|
|
}
|
|
|
|
impl FormData {
|
|
fn new_inherited(form: Option<&HTMLFormElement>, global: GlobalRef) -> FormData {
|
|
FormData {
|
|
reflector_: Reflector::new(),
|
|
data: DOMRefCell::new(HashMap::new()),
|
|
global: GlobalField::from_rooted(&global),
|
|
form: form.map(|f| JS::from_ref(f)),
|
|
}
|
|
}
|
|
|
|
pub fn new(form: Option<&HTMLFormElement>, global: GlobalRef) -> Root<FormData> {
|
|
reflect_dom_object(box FormData::new_inherited(form, global),
|
|
global, FormDataBinding::Wrap)
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef, form: Option<&HTMLFormElement>) -> Fallible<Root<FormData>> {
|
|
Ok(FormData::new(form, global))
|
|
}
|
|
}
|
|
|
|
impl<'a> FormDataMethods for &'a FormData {
|
|
#[allow(unrooted_must_root)]
|
|
fn Append(self, name: DOMString, value: &Blob, filename: Option<DOMString>) {
|
|
let file = FormDatum::FileData(JS::from_rooted(&self.get_file_from_blob(value, filename)));
|
|
let mut data = self.data.borrow_mut();
|
|
match data.entry(name) {
|
|
Occupied(entry) => entry.into_mut().push(file),
|
|
Vacant(entry) => {
|
|
entry.insert(vec!(file));
|
|
}
|
|
}
|
|
}
|
|
|
|
fn Append_(self, name: DOMString, value: DOMString) {
|
|
let mut data = self.data.borrow_mut();
|
|
match data.entry(name) {
|
|
Occupied(entry) => entry.into_mut().push(FormDatum::StringData(value)),
|
|
Vacant (entry) => { entry.insert(vec!(FormDatum::StringData(value))); },
|
|
}
|
|
}
|
|
|
|
fn Delete(self, name: DOMString) {
|
|
self.data.borrow_mut().remove(&name);
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
fn Get(self, name: DOMString) -> Option<FileOrString> {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let data = self.data.borrow();
|
|
if data.contains_key(&name) {
|
|
match data[&name][0].clone() {
|
|
FormDatum::StringData(ref s) => Some(eString(s.clone())),
|
|
FormDatum::FileData(ref f) => {
|
|
Some(eFile(f.root()))
|
|
}
|
|
}
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
fn Has(self, name: DOMString) -> bool {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let data = self.data.borrow();
|
|
data.contains_key(&name)
|
|
}
|
|
#[allow(unrooted_must_root)]
|
|
fn Set(self, name: DOMString, value: &Blob, filename: Option<DOMString>) {
|
|
let file = FormDatum::FileData(JS::from_rooted(&self.get_file_from_blob(value, filename)));
|
|
self.data.borrow_mut().insert(name, vec!(file));
|
|
}
|
|
|
|
fn Set_(self, name: DOMString, value: DOMString) {
|
|
self.data.borrow_mut().insert(name, vec!(FormDatum::StringData(value)));
|
|
}
|
|
}
|
|
|
|
trait PrivateFormDataHelpers{
|
|
fn get_file_from_blob(self, value: &Blob, filename: Option<DOMString>) -> Root<File>;
|
|
}
|
|
|
|
impl<'a> PrivateFormDataHelpers for &'a FormData {
|
|
fn get_file_from_blob(self, value: &Blob, filename: Option<DOMString>) -> Root<File> {
|
|
let global = self.global.root();
|
|
let f: Option<&File> = FileCast::to_ref(value);
|
|
let name = filename.unwrap_or(f.map(|inner| inner.name().clone()).unwrap_or("blob".to_owned()));
|
|
File::new(global.r(), value, name)
|
|
}
|
|
}
|