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

Auto merge of #9799 - nox:range-extractcontents, r=KiChjang

Browse source 
Fix step 14.2 of Range::ExtractContents

We need the last inclusive ancestor of start node that is not an inclusive ancestor
of end node, not the first that is an inclusive ancestor of it.

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

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

@ -564,8 +564,9 @@ impl RangeMethods for Range {
} else { } else {
// Step 14.1-2. // Step 14.1-2.
let reference_node = start_node.ancestors() let reference_node = start_node.ancestors()
.find(|n| n.is_inclusive_ancestor_of(end_node.r())) .take_while(|n| !n.is_inclusive_ancestor_of(&end_node))
.unwrap(); .last()
.unwrap_or(Root::from_ref(&start_node));
// Step 14.3. // Step 14.3.
(reference_node.GetParentNode().unwrap(), reference_node.index() + 1) (reference_node.GetParentNode().unwrap(), reference_node.index() + 1)
}; };

17
tests/wpt/metadata/dom/ranges/Range-extractContents.html.ini
View file

@ -1,17 +0,0 @@
[Range-extractContents.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 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