1 files changed, 57 insertions, 32 deletions

diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/htmlformcontrolscollection.rs
index a90e2dd48ee..f687870b058 100644
--- a/components/script/dom/htmlformcontrolscollection.rs
+++ b/components/script/dom/htmlformcontrolscollection.rs
@@ -1,44 +1,58 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
-use dom::bindings::codegen::Bindings::HTMLFormControlsCollectionBinding;
-use dom::bindings::codegen::Bindings::HTMLFormControlsCollectionBinding::HTMLFormControlsCollectionMethods;
-use dom::bindings::codegen::UnionTypes::RadioNodeListOrElement;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::{DomObject, reflect_dom_object};
-use dom::bindings::str::DOMString;
-use dom::element::Element;
-use dom::htmlcollection::{CollectionFilter, HTMLCollection};
-use dom::node::Node;
-use dom::radionodelist::RadioNodeList;
-use dom::window::Window;
+use crate::dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
+use crate::dom::bindings::codegen::Bindings::HTMLFormControlsCollectionBinding::HTMLFormControlsCollectionMethods;
+use crate::dom::bindings::codegen::Bindings::NodeBinding::{GetRootNodeOptions, NodeMethods};
+use crate::dom::bindings::codegen::UnionTypes::RadioNodeListOrElement;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::reflector::{reflect_dom_object, DomObject};
+use crate::dom::bindings::root::{Dom, DomRoot};
+use crate::dom::bindings::str::DOMString;
+use crate::dom::element::Element;
+use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection};
+use crate::dom::htmlformelement::HTMLFormElement;
+use crate::dom::node::Node;
+use crate::dom::radionodelist::RadioNodeList;
+use crate::dom::window::Window;
 use dom_struct::dom_struct;
-use std::iter;
+use servo_atoms::Atom;
 
 #[dom_struct]
 pub struct HTMLFormControlsCollection {
     collection: HTMLCollection,
+    form: Dom<HTMLFormElement>,
 }
 
 impl HTMLFormControlsCollection {
-    fn new_inherited(root: &Node, filter: Box<CollectionFilter + 'static>) -> HTMLFormControlsCollection {
+    fn new_inherited(
+        form: &HTMLFormElement,
+        filter: Box<dyn CollectionFilter + 'static>,
+    ) -> HTMLFormControlsCollection {
+        let root_of_form = form
+            .upcast::<Node>()
+            .GetRootNode(&GetRootNodeOptions::empty());
         HTMLFormControlsCollection {
-            collection: HTMLCollection::new_inherited(root, filter)
+            collection: HTMLCollection::new_inherited(&*root_of_form, filter),
+            form: Dom::from_ref(form),
         }
     }
 
-    pub fn new(window: &Window, root: &Node, filter: Box<CollectionFilter + 'static>)
-        -> Root<HTMLFormControlsCollection>
-    {
-        reflect_dom_object(box HTMLFormControlsCollection::new_inherited(root, filter),
-                           window,
-                           HTMLFormControlsCollectionBinding::Wrap)
+    pub fn new(
+        window: &Window,
+        form: &HTMLFormElement,
+        filter: Box<dyn CollectionFilter + 'static>,
+    ) -> DomRoot<HTMLFormControlsCollection> {
+        reflect_dom_object(
+            Box::new(HTMLFormControlsCollection::new_inherited(form, filter)),
+            window,
+        )
     }
 
     // FIXME: This shouldn't need to be implemented here since HTMLCollection (the parent of
     // HTMLFormControlsCollection) implements Length
+    #[allow(non_snake_case)]
     pub fn Length(&self) -> u32 {
         self.collection.Length()
     }
@@ -48,13 +62,20 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection {
     // https://html.spec.whatwg.org/multipage/#dom-htmlformcontrolscollection-nameditem
     fn NamedItem(&self, name: DOMString) -> Option<RadioNodeListOrElement> {
         // Step 1
-        if name.is_empty() { return None; }
+        if name.is_empty() {
+            return None;
+        }
+
+        let name = Atom::from(name);
 
         let mut filter_map = self.collection.elements_iter().filter_map(|elem| {
-            if elem.get_string_attribute(&local_name!("name")) == name
-               || elem.get_string_attribute(&local_name!("id")) == name {
+            if elem.get_name().map_or(false, |n| n == name) ||
+                elem.get_id().map_or(false, |i| i == name)
+            {
                 Some(elem)
-            } else { None }
+            } else {
+                None
+            }
         });
 
         if let Some(elem) = filter_map.next() {
@@ -64,15 +85,19 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection {
                 Some(RadioNodeListOrElement::Element(elem))
             } else {
                 // Step 4-5
-                let once = iter::once(Root::upcast::<Node>(elem));
-                let list = once.chain(peekable.map(Root::upcast));
                 let global = self.global();
                 let window = global.as_window();
-                Some(RadioNodeListOrElement::RadioNodeList(RadioNodeList::new_simple_list(window, list)))
+                // There is only one way to get an HTMLCollection,
+                // specifically HTMLFormElement::Elements(),
+                // and the collection filter excludes image inputs.
+                Some(RadioNodeListOrElement::RadioNodeList(
+                    RadioNodeList::new_controls_except_image_inputs(window, &*self.form, &name),
+                ))
             }
         // Step 3
-        } else { None }
-
+        } else {
+            None
+        }
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-htmlformcontrolscollection-nameditem
@@ -90,7 +115,7 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection {
     // https://github.com/servo/servo/issues/5875
     //
     // https://dom.spec.whatwg.org/#dom-htmlcollection-item
-    fn IndexedGetter(&self, index: u32) -> Option<Root<Element>> {
+    fn IndexedGetter(&self, index: u32) -> Option<DomRoot<Element>> {
         self.collection.IndexedGetter(index)
     }
 }