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

fix function on utf8 string, pass two tests

Browse source 
dom/nodes/Node-properties.html
detachedForeignComment.length]
detachedXmlComment.length]
This commit is contained in:
yodalee 2015-02-14 01:03:44 +08:00
parent e45b104721
commit 0e29eabb87
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/characterdata.rs
View file

@ -77,11 +77,11 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
} }
fn Length(self) -> u32 { fn Length(self) -> u32 {
self.data.borrow().len() as u32 self.data.borrow().chars().count() as u32
} }
fn SubstringData(self, offset: u32, count: u32) -> Fallible<DOMString> { fn SubstringData(self, offset: u32, count: u32) -> Fallible<DOMString> {
Ok(self.data.borrow()[offset as usize .. count as usize].to_owned()) Ok(self.data.borrow().slice_chars(offset as usize, (offset + count) as usize).to_owned())
} }
fn AppendData(self, arg: DOMString) -> ErrorResult { fn AppendData(self, arg: DOMString) -> ErrorResult {
@ -98,7 +98,7 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
} }
fn ReplaceData(self, offset: u32, count: u32, arg: DOMString) -> ErrorResult { fn ReplaceData(self, offset: u32, count: u32, arg: DOMString) -> ErrorResult {
let length = self.data.borrow().len() as u32; let length = self.data.borrow().chars().count() as u32;
if offset > length { if offset > length {
return Err(IndexSize); return Err(IndexSize);
} }
@ -107,9 +107,9 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
} else { } else {
count count
}; };
let mut data = self.data.borrow()[..offset as usize].to_owned(); let mut data = self.data.borrow().slice_chars(0, offset as usize).to_owned();
data.push_str(arg.as_slice()); data.push_str(arg.as_slice());
data.push_str(&self.data.borrow()[(offset + count) as usize..]); data.push_str(&self.data.borrow().slice_chars((offset + count) as usize, length as usize));
*self.data.borrow_mut() = data; *self.data.borrow_mut() = data;
// FIXME: Once we have `Range`, we should implement step7 to step11 // FIXME: Once we have `Range`, we should implement step7 to step11
Ok(()) Ok(())

6
tests/wpt/metadata/dom/nodes/Node-properties.html.ini
View file

@ -132,12 +132,6 @@
[detachedXmlTextNode.wholeText] [detachedXmlTextNode.wholeText]
expected: FAIL expected: FAIL
[detachedForeignComment.length]
expected: FAIL
[detachedXmlComment.length]
expected: FAIL
[paras[0\].previousElementSibling] [paras[0\].previousElementSibling]
expected: FAIL expected: FAIL