From e356310f385ce182b5b40aa7a29a00005941b658 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <krosylight@mozilla.com>
Date: Tue, 9 Mar 2021 14:12:34 +0000
Subject: [PATCH] Bug 1696123 - Always copy the checkedness of input elements
 r=edgar

Differential Revision: https://phabricator.services.mozilla.com/D107130
---
 dom/html/HTMLInputElement.cpp                 | 16 ++++-----
 .../the-input-element/cloning-steps.html      | 36 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
index 038041661fc2..c35888a53556 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -1115,18 +1115,18 @@ nsresult HTMLInputElement::Clone(dom::NodeInfo* aNodeInfo,
       }
       break;
     case VALUE_MODE_DEFAULT_ON:
-      if (mCheckedChanged) {
-        // We no longer have our original checked state.  Set our
-        // checked state on the clone.
-        it->DoSetChecked(mChecked, false, true);
-        // Then tell DoneCreatingElement() not to overwrite:
-        it->mShouldInitChecked = false;
-      }
-      break;
     case VALUE_MODE_DEFAULT:
       break;
   }
 
+  if (mCheckedChanged) {
+    // We no longer have our original checked state.  Set our
+    // checked state on the clone.
+    it->DoSetChecked(mChecked, false, true);
+    // Then tell DoneCreatingElement() not to overwrite:
+    it->mShouldInitChecked = false;
+  }
+
   it->DoneCreatingElement();
 
   it->mLastValueChangeWasInteractive = mLastValueChangeWasInteractive;
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/cloning-steps.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/cloning-steps.html
index 9e6c46fd7aa5..52cd57705e4b 100644
--- a/testing/web-platform/tests/html/semantics/forms/the-input-element/cloning-steps.html
+++ b/testing/web-platform/tests/html/semantics/forms/the-input-element/cloning-steps.html
@@ -10,8 +10,8 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script>
-"use strict";
+<script type=module>
+import inputTypes from "./input-types.js";
 
 test(function() {
   var input = document.createElement("input");
@@ -31,23 +31,25 @@ test(function() {
   assert_equals(copy.value, "foo bar");
 }, "input element's dirty value flag should be cloned, so setAttribute doesn't affect the cloned input's value");
 
-test(function() {
-  var input = document.createElement("input");
-  input.setAttribute("type", "radio");
-  input.checked = true;
+for (const inputType of inputTypes) {
+  test(function() {
+    var input = document.createElement("input");
+    input.setAttribute("type", inputType);
+    input.checked = true;
 
-  var copy = input.cloneNode();
-  assert_equals(copy.checked, true);
-}, "input element's checkedness should be cloned");
+    var copy = input.cloneNode();
+    assert_equals(copy.checked, true);
+  }, `input[type=${inputType}] element's checkedness should be cloned`);
 
-test(function() {
-  var input = document.createElement("input");
-  input.setAttribute("type", "radio");
-  input.checked = false;
+  test(function() {
+    var input = document.createElement("input");
+    input.setAttribute("type", inputType);
+    input.checked = false;
 
-  var copy = input.cloneNode();
-  copy.setAttribute("checked", "checked");
+    var copy = input.cloneNode();
+    copy.setAttribute("checked", "checked");
 
-  assert_equals(copy.checked, false);
-}, "input element's dirty checkedness should be cloned, so setAttribute doesn't affect the cloned input's checkedness");
+    assert_equals(copy.checked, false);
+  }, `input[type=${inputType}] element's dirty checkedness should be cloned, so setAttribute doesn't affect the cloned input's checkedness`);
+}
 </script>