From a45e1d9d95831077d3dcaf2cec696c43720a7bd5 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Thu, 13 Oct 2016 23:34:55 -0400
Subject: [PATCH 1/2] Implement "reset algorithm" for `<select>`.

---
 components/script/dom/htmlformelement.rs   |  3 +--
 components/script/dom/htmlselectelement.rs | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 090aa8553bf..26a30d07599 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -634,8 +634,7 @@ impl HTMLFormElement {
                 //    {}
                 //}
                 NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSelectElement)) => {
-                    // Unimplemented
-                    {}
+                    child.downcast::<HTMLSelectElement>().unwrap().reset();
                 }
                 NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTextAreaElement)) => {
                     child.downcast::<HTMLTextAreaElement>().unwrap().reset();
diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
index 34c9187b644..03d10e117f4 100644
--- a/components/script/dom/htmlselectelement.rs
+++ b/components/script/dom/htmlselectelement.rs
@@ -84,6 +84,16 @@ impl HTMLSelectElement {
                            HTMLSelectElementBinding::Wrap)
     }
 
+    // https://html.spec.whatwg.org/multipage/#the-select-element:concept-form-reset-control
+    pub fn reset(&self) {
+        let node = self.upcast::<Node>();
+        for opt in node.traverse_preorder().filter_map(Root::downcast::<HTMLOptionElement>) {
+            opt.set_selectedness(opt.DefaultSelected());
+            opt.set_dirtiness(false);
+        }
+        self.ask_for_reset();
+    }
+
     // https://html.spec.whatwg.org/multipage/#ask-for-a-reset
     pub fn ask_for_reset(&self) {
         if self.Multiple() {

From 957e1d8e7ad141d5ed95e0206f0f66326cd6f042 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Thu, 20 Oct 2016 00:00:57 -0400
Subject: [PATCH 2/2] Make 'reset-form.html' test more granular.

---
 .../resetting-a-form/reset-form.html.ini      |  6 +++---
 .../forms/resetting-a-form/reset-form.html    | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tests/wpt/metadata/html/semantics/forms/resetting-a-form/reset-form.html.ini b/tests/wpt/metadata/html/semantics/forms/resetting-a-form/reset-form.html.ini
index c2ff574ea9f..7a0f14f6953 100644
--- a/tests/wpt/metadata/html/semantics/forms/resetting-a-form/reset-form.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/resetting-a-form/reset-form.html.ini
@@ -1,11 +1,11 @@
 [reset-form.html]
   type: testharness
-  [Resetting the form by calling the reset() method]
+  [Resetting <output> by calling the reset() method]
     expected: FAIL
 
-  [Resetting the form by clicking the button in reset status]
+  [Resetting <output> by clicking the button in reset status]
     expected: FAIL
 
-  [Resetting the form by clicking the input in reset status]
+  [Resetting <output> by clicking the input in reset status]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form.html b/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form.html
index b74b52c46e4..7654cedbeb1 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form.html
@@ -87,10 +87,25 @@ function runTest(reset, description) {
     assert_false(document.getElementById("rd2").checked, "The checked attribute of the input element in radio should be false.");
     assert_true(document.getElementById("cb1").checked, "The checked attribute of the input element in checkbox should be true.");
     assert_false(document.getElementById("cb2").checked, "The checked attribute of the input element in checkbox should be false.");
+  }, "Resetting <input> " + description);
+
+  test(function() {
+    setPreconditions("Setting preconditions for resetting " + description);
+    reset();
     assert_equals(document.getElementById("ta").value, document.getElementById("ta").textContent, "The value attribute of the textarea element should be reset.");
     assert_equals(document.getElementById("ta").value, "abc", "The value attribute of the textarea element should be 'abc'.");
+  }, "Resetting <textarea> " + description);
+
+  test(function() {
+    setPreconditions("Setting preconditions for resetting " + description);
+    reset();
     assert_equals(document.getElementById("opt").textContent, document.getElementById("opt").defaultValue, "The textContent of the output element should be reset.");
     assert_equals(document.getElementById("opt").textContent, "abc", "The textContent of the output element should be 'abc'.");
+  }, "Resetting <output> " + description);
+
+  test(function() {
+    setPreconditions("Setting preconditions for resetting " + description);
+    reset();
     assert_true(document.getElementById("slt1").options[0].selected, "The first option in the select element should be selected.");
     assert_false(document.getElementById("slt1").options[1].selected, "The second option in the select element should not be selected.");
     assert_false(document.getElementById("slt2").options[0].selected, "The first option in the select element should not be selected.");
@@ -98,8 +113,8 @@ function runTest(reset, description) {
     assert_false(document.getElementById("slt3").options[0].selected, "The first option in the select element with multiple attribute should not be selected.");
     assert_true(document.getElementById("slt3").options[1].selected, "The second option in the select element with multiple attribute should be selected.");
     assert_true(document.getElementById("slt3").options[2].selected, "The third option in the select element with multiple attribute should be selected.");
-    //TODO: The keygen reset algorithm
-  }, "Resetting the form " + description);
+  }, "Resetting <select> " + description);
+  //TODO: The keygen reset algorithm
 }
 
 </script>