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

Auto merge of #9793 - nox:range-deletecontents, r=ecoal95

Browse source 
Fix step 6 of Range::DeleteContents

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9793)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-28 20:21:51 +05:30
commit be6940db59
2 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/range.rs
View file

@ -774,7 +774,7 @@ impl RangeMethods for Range {
let mut reference_node = Root::from_ref(start_node); let mut reference_node = Root::from_ref(start_node);
while let Some(parent) = reference_node.GetParentNode() { while let Some(parent) = reference_node.GetParentNode() {
if parent.is_inclusive_ancestor_of(end_node) { if parent.is_inclusive_ancestor_of(end_node) {
return (parent, reference_node.index()) return (parent, reference_node.index() + 1)
} }
reference_node = parent; reference_node = parent;
} }

15
tests/wpt/metadata/dom/ranges/Range-deleteContents.html.ini
View file

@ -1,14 +1,5 @@
[Range-deleteContents.html] [Range-deleteContents.html]
type: testharness type: testharness
[Resulting cursor position for range 18 [paras[0\].firstChild, 0, paras[1\].firstChild, 0\]]
expected: FAIL
[Resulting cursor position for range 19 [paras[0\].firstChild, 0, paras[1\].firstChild, 8\]]
expected: FAIL
[Resulting cursor position for range 20 [paras[0\].firstChild, 3, paras[3\], 1\]]
expected: FAIL
[Resulting DOM for range 24 [document, 0, document, 2\]] [Resulting DOM for range 24 [document, 0, document, 2\]]
expected: FAIL expected: FAIL
@ -30,9 +21,3 @@
[Resulting DOM for range 49 [document, 1, document, 2\]] [Resulting DOM for range 49 [document, 1, document, 2\]]
expected: FAIL expected: FAIL
[Resulting cursor position for range 50 [paras[2\].firstChild, 4, comment, 2\]]
expected: FAIL
[Resulting cursor position for range 51 [paras[3\], 1, comment, 8\]]
expected: FAIL