Implement Range::createContextualFragment

servo · bors-servo · Jun 3, 2016 · Jun 2, 2016 · May 29, 2016 · Jun 2, 2016
commit 5ab7f54762bade4d5c67dca0103f8f9b115baa30
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
@@ -130,7 +130,6 @@ impl Element {
         create_element(name, prefix, document, creator)
     }
 
-
     pub fn new_inherited(local_name: Atom,
                          namespace: Namespace, prefix: Option<DOMString>,
                          document: &Document) -> Element {

diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs
@@ -22,6 +22,9 @@ use dom::bindings::weakref::{WeakRef, WeakRefVec};
 use dom::characterdata::CharacterData;
 use dom::document::Document;
 use dom::documentfragment::DocumentFragment;
+use dom::element::Element;
+use dom::htmlbodyelement::HTMLBodyElement;
+use dom::htmlscriptelement::HTMLScriptElement;
 use dom::node::{Node, UnbindContext};
 use dom::text::Text;
 use heapsize::HeapSizeOf;
@@ -893,6 +896,44 @@ impl RangeMethods for Range {
         // Step 6.
         s
     }
+
+    // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#extensions-to-the-range-interface
+    fn CreateContextualFragment(&self, fragment: DOMString) -> Fallible<Root<DocumentFragment>> {
+        // Step 1.
+        let node = self.StartContainer();
+        let element = match node.type_id() {
+            NodeTypeId::Document(_) | NodeTypeId::DocumentFragment => None,
+            NodeTypeId::Element(_) => Some(node),
+            NodeTypeId::CharacterData(CharacterDataTypeId::Comment) |
+            NodeTypeId::CharacterData(CharacterDataTypeId::Text) => node.GetParentNode(),
+            NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) |
+            NodeTypeId::DocumentType => unreachable!(),
+        };
+
+        // Step 2.
+        let should_create_body = element.as_ref().map_or(true, |elem| {
+            let elem = elem.downcast::<Element>().unwrap();
+            elem.local_name() == &atom!("html") && elem.html_element_in_html_document()
+        });
+        let element: Root<Node> = if should_create_body {
+            Root::upcast(HTMLBodyElement::new(atom!("body"), None, &self.StartContainer().owner_doc()))
+        } else {
+            Root::upcast(element.unwrap())
+        };
+
+        // Step 3.
+        let fragment_node = try!(element.parse_fragment(fragment));
+
+        // Step 4.
+        for node in fragment_node.upcast::<Node>().traverse_preorder() {
+            if let Some(script) = node.downcast::<HTMLScriptElement>() {
+                script.set_already_started(false);
+            }
+        }
+
+        // Step 5.
+        Ok(fragment_node)
+    }
 }
 
 #[derive(JSTraceable)]

diff --git a/components/script/dom/webidls/Range.webidl b/components/script/dom/webidls/Range.webidl
@@ -76,9 +76,9 @@ interface Range {
 
 // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#extensions-to-the-range-interface
 partial interface Range {
-  // [NewObject, Throws]
-  // DocumentFragment createContextualFragment(DOMString fragment);
-};//
+  [NewObject, Throws]
+  DocumentFragment createContextualFragment(DOMString fragment);
+};
 
 // http://dev.w3.org/csswg/cssom-view/#extensions-to-the-range-interface
 partial interface Range {

diff --git a/tests/wpt/metadata/domparsing/createContextualFragment.html.ini b/tests/wpt/metadata/domparsing/createContextualFragment.html.ini
@@ -1,35 +1,11 @@
 [createContextualFragment.html]
   type: testharness
-  [Must not throw INVALID_STATE_ERR for a detached node.]
-    expected: FAIL
-
-  [Simple test with paragraphs]
-    expected: FAIL
-
-  [Don't auto-create <body> when applied to <html>]
-    expected: FAIL
-
   [<script>s should be run when appended to the document (but not before)]
     expected: FAIL
 
-  [<html> and <body> must work the same, 1]
-    expected: FAIL
-
-  [<html> and <body> must work the same, 2]
-    expected: FAIL
-
-  [Implicit <body> creation]
-    expected: FAIL
-
   [Namespace generally shouldn't matter]
     expected: FAIL
 
   [<html> in a different namespace shouldn't be special]
     expected: FAIL
 
-  [null should be stringified]
-    expected: FAIL
-
-  [undefined should be stringified]
-    expected: FAIL
-
diff --git a/...edded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini b/...edded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini
@@ -1,6 +1,6 @@
 [load-events-networkState.html]
   type: testharness
   expected: TIMEOUT
-
   [NETWORK_NO_SOURCE]
     expected: TIMEOUT
+
diff --git a/...t/metadata/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini b/...t/metadata/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [error]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/119.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/119.html.ini
diff --git a/.../metadata/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini b/.../metadata/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini
@@ -1,4 +1,3 @@
 [quickCheckAPI-G_I.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/10656
-
diff --git a/.../metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini b/.../metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini
@@ -1,14 +1,19 @@
 [copy-tex-image-2d-formats.html]
   [WebGL test #3: getError expected: NO_ERROR. Was INVALID_ENUM : should be no errors]
     expected: FAIL
+
   [WebGL test #6: getError expected: NO_ERROR. Was INVALID_ENUM : should be no errors]
     expected: FAIL
+
   [WebGL test #9: getError expected: NO_ERROR. Was INVALID_ENUM : should be no errors]
     expected: FAIL
+
   [WebGL test #12: getError expected: NO_ERROR. Was INVALID_ENUM : should be no errors]
     expected: FAIL
+
   [WebGL test #15: getError expected: NO_ERROR. Was INVALID_ENUM : should be no errors]
     expected: FAIL
+
   [WebGL test #16: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini
@@ -3,4 +3,3 @@
   expected:
     if os == "linux": CRASH
     if os == "mac": TIMEOUT
-
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot.html.ini
@@ -1,6 +1,5 @@
 [texture-npot.html]
   type: testharness
-
   [WebGL test #4: at (0, 0) expected: 0,0,0,255 was 192,0,128,64]
     expected: FAIL
 
@@ -117,3 +116,4 @@
 
   [WebGL test #83: getError expected: NO_ERROR. Was INVALID_ENUM : gl.generateMipmap with POT texture should return succeed]
     expected: FAIL
+
diff --git a/...wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini b/...wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
@@ -3,4 +3,3 @@
   expected:
     if os == "linux": CRASH
     if os == "mac": TIMEOUT
-