From f97d1d148b59585230fc7a9bf09d630e5a56ff50 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Sat, 24 Oct 2015 12:46:43 -0400
Subject: [PATCH 1/2] Implement 'control' attribute for <label> elements

---
 components/script/dom/document.rs             |  2 +-
 components/script/dom/htmlelement.rs          | 20 ++++++++
 components/script/dom/htmllabelelement.rs     | 49 ++++++++++++++++++-
 components/script/dom/virtualmethods.rs       |  4 ++
 .../dom/webidls/HTMLLabelElement.webidl       |  2 +-
 .../wpt/metadata/html/dom/interfaces.html.ini |  6 ---
 .../label-attributes.html.ini                 | 15 ------
 .../labelable-elements.html.ini               | 36 --------------
 8 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 23d455a1903..771342d0f36 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1147,7 +1147,7 @@ impl Document {
         })
     }
 
-    fn get_element_by_id(&self, id: &Atom) -> Option<Root<Element>> {
+    pub fn get_element_by_id(&self, id: &Atom) -> Option<Root<Element>> {
         self.idmap.borrow().get(&id).map(|ref elements| (*elements)[0].root())
     }
 }
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index 34a7847187a..b04082eae4d 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -296,6 +296,26 @@ impl HTMLElement {
         let local_name = Atom::from_slice(&to_snake_case(local_name));
         self.upcast::<Element>().remove_attribute(&ns!(""), &local_name);
     }
+
+    // https://html.spec.whatwg.org/multipage/#category-label
+    pub fn is_labelable_element(&self) -> bool {
+        // Note: HTMLKeygenElement is omitted because Servo doesn't currently implement it
+        match self.upcast::<Node>().type_id() {
+            NodeTypeId::Element(ElementTypeId::HTMLElement(type_id)) =>
+                match type_id {
+                    HTMLElementTypeId::HTMLInputElement =>
+                        self.downcast::<HTMLInputElement>().unwrap().Type() != "hidden",
+                    HTMLElementTypeId::HTMLButtonElement |
+                        HTMLElementTypeId::HTMLMeterElement |
+                        HTMLElementTypeId::HTMLOutputElement |
+                        HTMLElementTypeId::HTMLProgressElement |
+                        HTMLElementTypeId::HTMLSelectElement |
+                        HTMLElementTypeId::HTMLTextAreaElement => true,
+                    _ => false,
+                },
+            _ => false,
+        }
+    }
 }
 
 impl VirtualMethods for HTMLElement {
diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs
index 3beefc3db9a..e3328648c4d 100644
--- a/components/script/dom/htmllabelelement.rs
+++ b/components/script/dom/htmllabelelement.rs
@@ -2,13 +2,18 @@
  * 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/. */
 
+use dom::attr::AttrValue;
 use dom::bindings::codegen::Bindings::HTMLLabelElementBinding;
 use dom::bindings::codegen::Bindings::HTMLLabelElementBinding::HTMLLabelElementMethods;
+use dom::bindings::conversions::Castable;
 use dom::bindings::js::Root;
 use dom::document::Document;
+use dom::element::Element;
 use dom::htmlelement::HTMLElement;
 use dom::htmlformelement::{FormControl, HTMLFormElement};
-use dom::node::Node;
+use dom::node::{document_from_node, Node};
+use dom::virtualmethods::VirtualMethods;
+use string_cache::Atom;
 use util::str::DOMString;
 
 #[dom_struct]
@@ -40,6 +45,48 @@ impl HTMLLabelElementMethods for HTMLLabelElement {
     fn GetForm(&self) -> Option<Root<HTMLFormElement>> {
         self.form_owner()
     }
+
+    // https://html.spec.whatwg.org/multipage/#dom-label-control
+    fn GetControl(&self) -> Option<Root<HTMLElement>> {
+        if !self.upcast::<Node>().is_in_doc() {
+            return None;
+        }
+
+        let for_attr = match self.upcast::<Element>().get_attribute(&ns!(""), &atom!("for")) {
+            Some(for_attr) => for_attr,
+            None => return self.first_labelable_descendant(),
+        };
+
+        let for_value = for_attr.value();
+        document_from_node(self).get_element_by_id(for_value.as_atom())
+                                .and_then(Root::downcast::<HTMLElement>)
+                                .into_iter()
+                                .filter(|e| e.is_labelable_element())
+                                .next()
+    }
+}
+
+impl VirtualMethods for HTMLLabelElement {
+    fn super_type(&self) -> Option<&VirtualMethods> {
+        Some(self.upcast::<HTMLElement>() as &VirtualMethods)
+    }
+
+    fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue {
+        match name {
+            &atom!("for") => AttrValue::from_atomic(value),
+            _ => self.super_type().unwrap().parse_plain_attribute(name, value),
+        }
+    }
+}
+
+impl HTMLLabelElement {
+    fn first_labelable_descendant(&self) -> Option<Root<HTMLElement>> {
+        self.upcast::<Node>()
+            .traverse_preorder()
+            .filter_map(Root::downcast::<HTMLElement>)
+            .filter(|elem| elem.is_labelable_element())
+            .next()
+    }
 }
 
 impl FormControl for HTMLLabelElement {}
diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs
index da80f414da4..32406205e5d 100644
--- a/components/script/dom/virtualmethods.rs
+++ b/components/script/dom/virtualmethods.rs
@@ -25,6 +25,7 @@ use dom::htmlheadelement::HTMLHeadElement;
 use dom::htmliframeelement::HTMLIFrameElement;
 use dom::htmlimageelement::HTMLImageElement;
 use dom::htmlinputelement::HTMLInputElement;
+use dom::htmllabelelement::HTMLLabelElement;
 use dom::htmllinkelement::HTMLLinkElement;
 use dom::htmlmetaelement::HTMLMetaElement;
 use dom::htmlobjectelement::HTMLObjectElement;
@@ -164,6 +165,9 @@ pub fn vtable_for(node: &Node) -> &VirtualMethods {
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement)) => {
             node.downcast::<HTMLInputElement>().unwrap() as &VirtualMethods
         }
+        NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLabelElement)) => {
+            node.downcast::<HTMLLabelElement>().unwrap() as &VirtualMethods
+        }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLinkElement)) => {
             node.downcast::<HTMLLinkElement>().unwrap() as &VirtualMethods
         }
diff --git a/components/script/dom/webidls/HTMLLabelElement.webidl b/components/script/dom/webidls/HTMLLabelElement.webidl
index 00900df77fc..7188f1d2d43 100644
--- a/components/script/dom/webidls/HTMLLabelElement.webidl
+++ b/components/script/dom/webidls/HTMLLabelElement.webidl
@@ -7,5 +7,5 @@
 interface HTMLLabelElement : HTMLElement {
   readonly attribute HTMLFormElement? form;
   //         attribute DOMString htmlFor;
-  //readonly attribute HTMLElement? control;
+  readonly attribute HTMLElement? control;
 };
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 561b37584bd..9769e9eab55 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -4884,15 +4884,9 @@
   [HTMLLabelElement interface: attribute htmlFor]
     expected: FAIL
 
-  [HTMLLabelElement interface: attribute control]
-    expected: FAIL
-
   [HTMLLabelElement interface: document.createElement("label") must inherit property "htmlFor" with the proper type (1)]
     expected: FAIL
 
-  [HTMLLabelElement interface: document.createElement("label") must inherit property "control" with the proper type (2)]
-    expected: FAIL
-
   [HTMLInputElement interface: existence and properties of interface object]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
index 30ba26e5898..539cf5daf81 100644
--- a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
@@ -1,23 +1,8 @@
 [label-attributes.html]
   type: testharness
-  [A label element with a 'for' attribute should only be associated with a labelable element.]
-    expected: FAIL
-
-  [A label element not in a document can not label any element in the document.]
-    expected: FAIL
-
-  [The labeled control for a label element that has no 'for' attribute is the first labelable element which is a descendant of that label element.]
-    expected: FAIL
-
-  [The 'for' attribute points to an inexistent id.]
-    expected: FAIL
-
   [A non-control follows by a control with same ID.]
     expected: FAIL
 
-  [The 'for' attribute is an empty string.]
-    expected: FAIL
-
   [A form control has multiple labels.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/the-label-element/labelable-elements.html.ini b/tests/wpt/metadata/html/semantics/forms/the-label-element/labelable-elements.html.ini
index d31ee3c61c8..be4d7c998ba 100644
--- a/tests/wpt/metadata/html/semantics/forms/the-label-element/labelable-elements.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/the-label-element/labelable-elements.html.ini
@@ -1,41 +1,5 @@
 [labelable-elements.html]
   type: testharness
-  [Check if the output element is a labelable element]
-    expected: FAIL
-
-  [Check if the progress element is a labelable element]
-    expected: FAIL
-
-  [Check if the select element is a labelable element]
-    expected: FAIL
-
-  [Check if the textarea element is a labelable form-element]
-    expected: FAIL
-
-  [Check if the button element is a labelable element]
-    expected: FAIL
-
-  [Check if the hidden input element is not a labelable element.]
-    expected: FAIL
-
-  [Check if the input element in radio state is a labelable element]
-    expected: FAIL
-
   [Check if the keygen element is a labelable element]
     expected: FAIL
 
-  [Check if the meter element is a labelable element]
-    expected: FAIL
-
-  [Check if the fieldset element is not a labelable element]
-    expected: FAIL
-
-  [Check if the label element is not a labelable element]
-    expected: FAIL
-
-  [Check if the object element is not a labelable element]
-    expected: FAIL
-
-  [Check if the img element is not a labelable element]
-    expected: FAIL
-

From 98a6fc07e2acb44e764158365579f17bbd037ff0 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Sat, 24 Oct 2015 13:09:15 -0400
Subject: [PATCH 2/2] Implement 'htmlFor' attribute for <label> elements

---
 components/script/dom/htmllabelelement.rs     |   6 +
 .../dom/webidls/HTMLLabelElement.webidl       |   2 +-
 .../wpt/metadata/html/dom/interfaces.html.ini |   6 -
 .../html/dom/reflection-forms.html.ini        | 129 ------------------
 .../label-attributes.html.ini                 |   3 -
 5 files changed, 7 insertions(+), 139 deletions(-)

diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs
index e3328648c4d..bcda8df24cc 100644
--- a/components/script/dom/htmllabelelement.rs
+++ b/components/script/dom/htmllabelelement.rs
@@ -46,6 +46,12 @@ impl HTMLLabelElementMethods for HTMLLabelElement {
         self.form_owner()
     }
 
+    // https://html.spec.whatwg.org/multipage/#dom-label-htmlfor
+    make_getter!(HtmlFor, "for");
+
+    // https://html.spec.whatwg.org/multipage/#dom-label-htmlfor
+    make_atomic_setter!(SetHtmlFor, "for");
+
     // https://html.spec.whatwg.org/multipage/#dom-label-control
     fn GetControl(&self) -> Option<Root<HTMLElement>> {
         if !self.upcast::<Node>().is_in_doc() {
diff --git a/components/script/dom/webidls/HTMLLabelElement.webidl b/components/script/dom/webidls/HTMLLabelElement.webidl
index 7188f1d2d43..22659c26e76 100644
--- a/components/script/dom/webidls/HTMLLabelElement.webidl
+++ b/components/script/dom/webidls/HTMLLabelElement.webidl
@@ -6,6 +6,6 @@
 // https://html.spec.whatwg.org/multipage/#htmllabelelement
 interface HTMLLabelElement : HTMLElement {
   readonly attribute HTMLFormElement? form;
-  //         attribute DOMString htmlFor;
+  attribute DOMString htmlFor;
   readonly attribute HTMLElement? control;
 };
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 9769e9eab55..7991e41c459 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -4881,12 +4881,6 @@
   [HTMLLabelElement interface: existence and properties of interface object]
     expected: FAIL
 
-  [HTMLLabelElement interface: attribute htmlFor]
-    expected: FAIL
-
-  [HTMLLabelElement interface: document.createElement("label") must inherit property "htmlFor" with the proper type (1)]
-    expected: FAIL
-
   [HTMLInputElement interface: existence and properties of interface object]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/dom/reflection-forms.html.ini b/tests/wpt/metadata/html/dom/reflection-forms.html.ini
index 851591ec145..21effce681d 100644
--- a/tests/wpt/metadata/html/dom/reflection-forms.html.ini
+++ b/tests/wpt/metadata/html/dom/reflection-forms.html.ini
@@ -2913,135 +2913,6 @@
   [label.tabIndex: IDL set to -2147483648 followed by getAttribute()]
     expected: FAIL
 
-  [label.htmlFor (<label for>): typeof IDL attribute]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL get with DOM attribute unset]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to "" followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo " followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to undefined followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to 7 followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to 1.5 followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to true followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to false followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to object "[object Object\]" followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to NaN followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to Infinity followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to -Infinity followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to "\\0" followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to null followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to object "test-toString" followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): setAttribute() to object "test-valueOf" followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to "" followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo " followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to undefined followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to undefined followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to 7 followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to 7 followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to 1.5 followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to 1.5 followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to true followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to true followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to false followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to false followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to object "[object Object\]" followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to object "[object Object\]" followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to NaN followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to NaN followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to Infinity followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to Infinity followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to -Infinity followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to -Infinity followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to "\\0" followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to null followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to null followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to object "test-toString" followed by getAttribute()]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to object "test-toString" followed by IDL get]
-    expected: FAIL
-
-  [label.htmlFor (<label for>): IDL set to object "test-valueOf" followed by IDL get]
-    expected: FAIL
-
   [label.itemScope: typeof IDL attribute]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
index 539cf5daf81..655c489ce75 100644
--- a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
@@ -12,6 +12,3 @@
   [A form control has no label 2.]
     expected: FAIL
 
-  [A label's htmlFor attribute must reflect the for content attribute]
-    expected: FAIL
-