diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-28 20:21:51 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-28 20:21:51 +0530 |
| commit | be6940db59a2e8bf4fac45911848edbc8cd3dd8d (patch) | |
| tree | e48ba4ea11fe1fc832183a192a0f453c04a6f6db | |
| parent | 39502d6bed76343930b9d6409203e9c2e9ff09fc (diff) | |
| parent | 0ac931a43ec19f68e290ee3683bb72295087cdc1 (diff) | |
| download | servo-be6940db59a2e8bf4fac45911848edbc8cd3dd8d.tar.gz servo-be6940db59a2e8bf4fac45911848edbc8cd3dd8d.zip | |
Auto merge of #9793 - nox:range-deletecontents, r=ecoal95
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 -->
| -rw-r--r-- | components/script/dom/range.rs | 2 | ||||
| -rw-r--r-- | tests/wpt/metadata/dom/ranges/Range-deleteContents.html.ini | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index 6807a7a2d3c..88fc9ad35bc 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -774,7 +774,7 @@ impl RangeMethods for Range { let mut reference_node = Root::from_ref(start_node); while let Some(parent) = reference_node.GetParentNode() { if parent.is_inclusive_ancestor_of(end_node) { - return (parent, reference_node.index()) + return (parent, reference_node.index() + 1) } reference_node = parent; } diff --git a/tests/wpt/metadata/dom/ranges/Range-deleteContents.html.ini b/tests/wpt/metadata/dom/ranges/Range-deleteContents.html.ini index 61ba2ed3da6..d026b7aaa35 100644 --- a/tests/wpt/metadata/dom/ranges/Range-deleteContents.html.ini +++ b/tests/wpt/metadata/dom/ranges/Range-deleteContents.html.ini @@ -1,14 +1,5 @@ [Range-deleteContents.html] 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\]] expected: FAIL @@ -30,9 +21,3 @@ [Resulting DOM for range 49 [document, 1, document, 2\]] 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 - |