mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Auto merge of #9797 - nox:range-insertnode, r=KiChjang
Fix step 1 of Range::InsertNode The method needs to throw when trying to insert start node into range. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9797) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
commit
b3964a8958
3 changed files with 3 additions and 142 deletions
|
|
@ -658,6 +658,9 @@ impl RangeMethods for Range {
|
|||
let start_offset = self.StartOffset();
|
||||
|
||||
// Step 1.
|
||||
if &*start_node == node {
|
||||
return Err(Error::HierarchyRequest);
|
||||
}
|
||||
match start_node.type_id() {
|
||||
// Handled under step 2.
|
||||
NodeTypeId::CharacterData(CharacterDataTypeId::Text) => (),
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
[Range-insertNode.html]
|
||||
type: testharness
|
||||
[0,1: resulting DOM for range [paras[0\].firstChild, 0, paras[0\].firstChild, 0\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[0,1: resulting range position for range [paras[0\].firstChild, 0, paras[0\].firstChild, 0\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[1,1: resulting DOM for range [paras[0\].firstChild, 0, paras[0\].firstChild, 1\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[1,1: resulting range position for range [paras[0\].firstChild, 0, paras[0\].firstChild, 1\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[2,1: resulting DOM for range [paras[0\].firstChild, 2, paras[0\].firstChild, 8\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[2,1: resulting range position for range [paras[0\].firstChild, 2, paras[0\].firstChild, 8\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[3,1: resulting DOM for range [paras[0\].firstChild, 2, paras[0\].firstChild, 9\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[3,1: resulting range position for range [paras[0\].firstChild, 2, paras[0\].firstChild, 9\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[4,2: resulting DOM for range [paras[1\].firstChild, 0, paras[1\].firstChild, 0\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[4,2: resulting range position for range [paras[1\].firstChild, 0, paras[1\].firstChild, 0\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[5,2: resulting DOM for range [paras[1\].firstChild, 2, paras[1\].firstChild, 9\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[5,2: resulting range position for range [paras[1\].firstChild, 2, paras[1\].firstChild, 9\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[6,6: resulting DOM for range [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[6,6: resulting range position for range [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[7,6: resulting DOM for range [detachedPara1.firstChild, 2, detachedPara1.firstChild, 8\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[7,6: resulting range position for range [detachedPara1.firstChild, 2, detachedPara1.firstChild, 8\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[8,4: resulting DOM for range [foreignPara1.firstChild, 0, foreignPara1.firstChild, 0\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[8,4: resulting range position for range [foreignPara1.firstChild, 0, foreignPara1.firstChild, 0\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[9,4: resulting DOM for range [foreignPara1.firstChild, 2, foreignPara1.firstChild, 8\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[9,4: resulting range position for range [foreignPara1.firstChild, 2, foreignPara1.firstChild, 8\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[18,1: resulting DOM for range [paras[0\].firstChild, 0, paras[1\].firstChild, 0\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[18,1: resulting range position for range [paras[0\].firstChild, 0, paras[1\].firstChild, 0\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[19,1: resulting DOM for range [paras[0\].firstChild, 0, paras[1\].firstChild, 8\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[19,1: resulting range position for range [paras[0\].firstChild, 0, paras[1\].firstChild, 8\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[20,1: resulting DOM for range [paras[0\].firstChild, 3, paras[3\], 1\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[20,1: resulting range position for range [paras[0\].firstChild, 3, paras[3\], 1\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
[Range-surroundContents.html]
|
||||
type: testharness
|
||||
[0,1: resulting DOM for range [paras[0\].firstChild, 0, paras[0\].firstChild, 0\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[0,1: resulting range position for range [paras[0\].firstChild, 0, paras[0\].firstChild, 0\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[1,1: resulting DOM for range [paras[0\].firstChild, 0, paras[0\].firstChild, 1\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[1,1: resulting range position for range [paras[0\].firstChild, 0, paras[0\].firstChild, 1\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[2,1: resulting DOM for range [paras[0\].firstChild, 2, paras[0\].firstChild, 8\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[2,1: resulting range position for range [paras[0\].firstChild, 2, paras[0\].firstChild, 8\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[3,1: resulting DOM for range [paras[0\].firstChild, 2, paras[0\].firstChild, 9\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[3,1: resulting range position for range [paras[0\].firstChild, 2, paras[0\].firstChild, 9\], node paras[0\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[4,2: resulting DOM for range [paras[1\].firstChild, 0, paras[1\].firstChild, 0\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[4,2: resulting range position for range [paras[1\].firstChild, 0, paras[1\].firstChild, 0\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[5,2: resulting DOM for range [paras[1\].firstChild, 2, paras[1\].firstChild, 9\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[5,2: resulting range position for range [paras[1\].firstChild, 2, paras[1\].firstChild, 9\], node paras[1\].firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[6,6: resulting DOM for range [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[6,6: resulting range position for range [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[7,6: resulting DOM for range [detachedPara1.firstChild, 2, detachedPara1.firstChild, 8\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[7,6: resulting range position for range [detachedPara1.firstChild, 2, detachedPara1.firstChild, 8\], node detachedPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[8,4: resulting DOM for range [foreignPara1.firstChild, 0, foreignPara1.firstChild, 0\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[8,4: resulting range position for range [foreignPara1.firstChild, 0, foreignPara1.firstChild, 0\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[9,4: resulting DOM for range [foreignPara1.firstChild, 2, foreignPara1.firstChild, 8\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
[9,4: resulting range position for range [foreignPara1.firstChild, 2, foreignPara1.firstChild, 8\], node foreignPara1.firstChild]
|
||||
expected: FAIL
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue