From 8b425fb8cf947c13e4609c114a4c155ba43ed8a6 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Wed, 26 Feb 2014 10:08:06 +0530
Subject: [PATCH] Make document.getElementsByTagname return a NodeList;
 consolidate element collection to collectElement; fix #1744

---
 src/components/script/dom/document.rs         | 22 +++++++++++++++----
 .../script/dom/webidls/Document.webidl        |  2 +-
 src/test/html/content/test_collections.html   |  1 -
 .../test_document_getElementsByName.html      | 15 +++++++++++++
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 src/test/html/content/test_document_getElementsByName.html

diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index 5994f653f18..5c1fea26596 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -21,6 +21,7 @@ use dom::element::{HTMLBodyElementTypeId, HTMLFrameSetElementTypeId};
 use dom::event::Event;
 use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::htmlcollection::HTMLCollection;
+use dom::nodelist::NodeList;
 use dom::htmlelement::HTMLElement;
 use dom::htmlheadelement::HTMLHeadElement;
 use dom::htmlhtmlelement::HTMLHtmlElement;
@@ -403,8 +404,8 @@ impl Document {
     }
 
     // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-getelementsbyname
-    pub fn GetElementsByName(&self, name: DOMString) -> JS<HTMLCollection> {
-        self.createHTMLCollection(|elem| {
+    pub fn GetElementsByName(&self, name: DOMString) -> JS<NodeList> {
+        self.createNodeList(|elem| {
             elem.get_attribute(Null, "name").map_default(false, |attr| {
                 attr.get().value_ref() == name
             })
@@ -449,7 +450,7 @@ impl Document {
         self.createHTMLCollection(|elem| "applet" == elem.tag_name)
     }
 
-    pub fn createHTMLCollection(&self, callback: |elem: &Element| -> bool) -> JS<HTMLCollection> {
+    pub fn create_collection(&self, callback: |elem: &Element| -> bool) -> ~[JS<Element>] {
         let mut elements = ~[];
         match self.GetDocumentElement() {
             None => {},
@@ -465,7 +466,20 @@ impl Document {
                 }
             }
         }
-        HTMLCollection::new(&self.window, elements)
+        elements
+    }
+
+    pub fn createHTMLCollection(&self, callback: |elem: &Element| -> bool) -> JS<HTMLCollection> {
+        HTMLCollection::new(&self.window, self.create_collection(callback))
+    }
+
+    pub fn createNodeList(&self, callback: |elem: &Element| -> bool) -> JS<NodeList> {
+        let elements = self.create_collection(callback);
+        let nodes = elements.map(|element| {
+            let node: JS<Node> = NodeCast::from(element);
+            node
+        });
+        NodeList::new_simple_list(&self.window, nodes)
     }
 
     pub fn content_changed(&self) {
diff --git a/src/components/script/dom/webidls/Document.webidl b/src/components/script/dom/webidls/Document.webidl
index daa91f540fb..11e92a0930e 100644
--- a/src/components/script/dom/webidls/Document.webidl
+++ b/src/components/script/dom/webidls/Document.webidl
@@ -44,7 +44,7 @@ partial interface Document {
            attribute DOMString title;
            attribute HTMLElement? body;
   readonly attribute HTMLHeadElement? head;
-  /*NodeList*/ HTMLCollection getElementsByName(DOMString elementName);
+  NodeList getElementsByName(DOMString elementName);
 
   readonly attribute HTMLCollection images;
   readonly attribute HTMLCollection embeds;
diff --git a/src/test/html/content/test_collections.html b/src/test/html/content/test_collections.html
index f3dc6d33e59..323ee450938 100644
--- a/src/test/html/content/test_collections.html
+++ b/src/test/html/content/test_collections.html
@@ -38,7 +38,6 @@ check_collection(document.scripts, 2, [HTMLScriptElement], "SCRIPT");
 check_collection(document.applets, 1, [HTMLAppletElement], "APPLET");
 check_collection(document.forms,   1, [HTMLFormElement],   "FORM");
 
-check_collection(document.getElementsByName("test"), 2);
 check_collection(document.getElementsByTagName("nosuchtag"), 0);
 
 check_tag("section",  1, []);
diff --git a/src/test/html/content/test_document_getElementsByName.html b/src/test/html/content/test_document_getElementsByName.html
new file mode 100644
index 00000000000..ab69292eced
--- /dev/null
+++ b/src/test/html/content/test_document_getElementsByName.html
@@ -0,0 +1,15 @@
+<html>
+<head >
+  <title></title>
+  <script src="harness.js"></script>
+</head>
+<body>
+  <div name="foo"></div>
+  <script>
+    let nameList = document.getElementsByName("foo");
+    is_a(nameList, NodeList);
+    is_not_a(nameList, HTMLCollection);
+    finish();
+  </script>
+</body>
+</html>