Add missing actions in CreateContextualFragment method

servo · Nov 17, 2016 · 2f1073e · 2f1073e
1 parent 00f229d
commit 2f1073e
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 12 deletions.
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
@@ -595,6 +595,10 @@ impl HTMLScriptElement {
         is_js
     }
 
+    pub fn set_parser_inserted(&self, parser_inserted: bool) {
+        self.parser_inserted.set(parser_inserted);
+    }
+
     pub fn set_already_started(&self, already_started: bool) {
         self.already_started.set(already_started);
     }

diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs
@@ -903,9 +903,9 @@ impl RangeMethods for Range {
         let node = self.StartContainer();
         let element = match node.type_id() {
             NodeTypeId::Document(_) | NodeTypeId::DocumentFragment => None,
-            NodeTypeId::Element(_) => Some(node),
+            NodeTypeId::Element(_) => Some(Root::downcast::<Element>(node).unwrap()),
             NodeTypeId::CharacterData(CharacterDataTypeId::Comment) |
-            NodeTypeId::CharacterData(CharacterDataTypeId::Text) => node.GetParentNode(),
+            NodeTypeId::CharacterData(CharacterDataTypeId::Text) => node.GetParentElement(),
             NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) |
             NodeTypeId::DocumentType => unreachable!(),
         };
@@ -928,6 +928,7 @@ impl RangeMethods for Range {
         for node in fragment_node.upcast::<Node>().traverse_preorder() {
             if let Some(script) = node.downcast::<HTMLScriptElement>() {
                 script.set_already_started(false);
+                script.set_parser_inserted(false);
             }
         }
 

diff --git a/tests/wpt/metadata/domparsing/createContextualFragment.html.ini b/tests/wpt/metadata/domparsing/createContextualFragment.html.ini
@@ -1,8 +1,5 @@
 [createContextualFragment.html]
   type: testharness
-  [<script>s should be run when appended to the document (but not before)]
-    expected: FAIL
-
   [Namespace generally shouldn't matter]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini
@@ -1,4 +1,3 @@
 [cors-redirect-worker.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13441
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini
@@ -1,4 +1,3 @@
 [cors-redirect.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13441
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
@@ -1,4 +1,3 @@
 [redirect-count-worker.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13441
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
@@ -1,4 +1,3 @@
 [redirect-count.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13441
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
@@ -1,4 +1,3 @@
 [redirect-origin-worker.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13441
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
@@ -1,4 +1,3 @@
 [redirect-origin.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13441
-
diff --git a/tests/wpt/metadata/fetch/api/request/request-cache-default-conditional.html.ini b/tests/wpt/metadata/fetch/api/request/request-cache-default-conditional.html.ini
@@ -1,4 +1,3 @@
 [request-cache-default-conditional.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13441
-
diff --git a/tests/wpt/web-platform-tests/domparsing/createContextualFragment.html b/tests/wpt/web-platform-tests/domparsing/createContextualFragment.html
@@ -109,6 +109,10 @@
         }
 }
 
+var doc_fragment = document.createDocumentFragment();
+var comment = document.createComment("~o~");
+doc_fragment.appendChild(comment);
+
 var tests = [
         ["<html> and <body> must work the same, 1", document.documentElement, "<span>Hello world</span>", document.body, "<span>Hello world</span>"],
         ["<html> and <body> must work the same, 2", document.documentElement, "<body><p>Hello world", document.body, "<body><p>Hello world"],
@@ -126,6 +130,9 @@
         ["undefined should be stringified", document.createElement("span"), undefined, document.createElement("span"), "undefined"],
         ["Text nodes shouldn't be special",
                 document.createTextNode("?"), "<body><p>",
+                document.createElement("div"), "<body><p>"],
+        ["Non-Element parent should not be special",
+                comment, "<body><p>",
                 document.createElement("div"), "<body><p>"]
 ];