Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +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

20
src/components/script/dom/characterdata.rs
View file

@ -22,12 +22,12 @@ impl CharacterData {
}
}
pub fn Data(&self) -> Option<DOMString> {
Some(self.data.clone())
pub fn Data(&self) -> DOMString {
self.data.clone()
}
pub fn SetData(&mut self, arg: &Option<DOMString>) -> ErrorResult {
self.data = arg.get_ref().clone();
pub fn SetData(&mut self, arg: &DOMString) -> ErrorResult {
self.data = arg.clone();
Ok(())
}
@ -35,16 +35,16 @@ impl CharacterData {
self.data.len() as u32
}
pub fn SubstringData(&self, offset: u32, count: u32) -> Fallible<Option<DOMString>> {
Ok(Some(self.data.slice(offset as uint, count as uint).to_str()))
pub fn SubstringData(&self, offset: u32, count: u32) -> Fallible<DOMString> {
Ok(self.data.slice(offset as uint, count as uint).to_str())
}
pub fn AppendData(&mut self, arg: &Option<DOMString>) -> ErrorResult {
self.data.push_str(arg.get_ref().clone());
pub fn AppendData(&mut self, arg: &DOMString) -> ErrorResult {
self.data.push_str(*arg);
Ok(())
}
pub fn InsertData(&mut self, _offset: u32, _arg: &Option<DOMString>) -> ErrorResult {
pub fn InsertData(&mut self, _offset: u32, _arg: &DOMString) -> ErrorResult {
fail!("CharacterData::InsertData() is unimplemented")
}
@ -52,7 +52,7 @@ impl CharacterData {
fail!("CharacterData::DeleteData() is unimplemented")
}
pub fn ReplaceData(&mut self, _offset: u32, _count: u32, _arg: &Option<DOMString>) -> ErrorResult {
pub fn ReplaceData(&mut self, _offset: u32, _count: u32, _arg: &DOMString) -> ErrorResult {
fail!("CharacterData::ReplaceData() is unimplemented")
}
}