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

Don't pass nullable strings to native DOM methods that want non-nullable strings. Fixes #1207.

Browse source
This commit is contained in:
Ms2ger 2013-11-10 14:11:15 +01:00
parent 803cd4b7cf
commit 08afc6d19d
75 changed files with 968 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::bindings::utils::{DOMString, null_str_as_empty};
use dom::bindings::utils::DOMString;
use dom::bindings::codegen::FormDataBinding;
use dom::blob::Blob;
use dom::window::Window;
@ -11,8 +11,8 @@ use dom::window::Window;
use std::hashmap::HashMap;
enum FormDatum {
StringData(Option<DOMString>),
BlobData { blob: @mut Blob, name: Option<DOMString> }
StringData(DOMString),
BlobData { blob: @mut Blob, name: DOMString }
}
pub struct FormData {
@ -34,16 +34,16 @@ impl FormData {
reflect_dom_object(@mut FormData::new_inherited(window), window, FormDataBinding::Wrap)
}
pub fn Append(&mut self, name: &Option<DOMString>, value: @mut Blob, filename: Option<Option<DOMString>>) {
pub fn Append(&mut self, name: &DOMString, value: @mut Blob, filename: Option<DOMString>) {
let blob = BlobData {
blob: value,
name: filename.unwrap_or(Some(~"default"))
name: filename.unwrap_or(~"default")
};
self.data.insert(null_str_as_empty(name), blob);
self.data.insert(name.clone(), blob);
}
pub fn Append_(&mut self, name: &Option<DOMString>, value: &Option<DOMString>) {
self.data.insert(null_str_as_empty(name), StringData((*value).clone()));
pub fn Append_(&mut self, name: &DOMString, value: &DOMString) {
self.data.insert(name.clone(), StringData((*value).clone()));
}
}