From 0e4be21df427af02fc3579296038ea7532672997 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Tue, 4 Oct 2016 13:35:36 -0700 Subject: [PATCH] Backed out changeset 2a5aeed15578 (bug 1052045) for test_bug596511.html failures a=backout --- dom/html/HTMLSelectElement.cpp | 15 +-- testing/web-platform/meta/MANIFEST.json | 6 -- .../the-select-element/select-validity.html | 99 ------------------- 3 files changed, 5 insertions(+), 115 deletions(-) delete mode 100644 testing/web-platform/tests/html/semantics/forms/the-select-element/select-validity.html diff --git a/dom/html/HTMLSelectElement.cpp b/dom/html/HTMLSelectElement.cpp index 2d69a26473cb..dbac898a85e8 100644 --- a/dom/html/HTMLSelectElement.cpp +++ b/dom/html/HTMLSelectElement.cpp @@ -1773,15 +1773,6 @@ HTMLSelectElement::IsValueMissing() for (uint32_t i = 0; i < length; ++i) { RefPtr option = Item(i); - // Check for a placeholder label option, don't count it as a valid value - if (i == 0 && !Multiple() && Size() <= 1 && option->GetParent() == this) { - nsAutoString value; - MOZ_ALWAYS_SUCCEEDS(option->GetValue(value)); - if (value.IsEmpty()) { - continue; - } - } - if (!option->Selected()) { continue; } @@ -1790,7 +1781,11 @@ HTMLSelectElement::IsValueMissing() continue; } - return false; + nsAutoString value; + MOZ_ALWAYS_SUCCEEDS(option->GetValue(value)); + if (!value.IsEmpty()) { + return false; + } } return true; diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json index a91a0dba32e4..ff7487e6c5e4 100644 --- a/testing/web-platform/meta/MANIFEST.json +++ b/testing/web-platform/meta/MANIFEST.json @@ -37430,12 +37430,6 @@ "url": "/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html" } ], - "html/semantics/forms/the-select-element/select-validity.html": [ - { - "path": "html/semantics/forms/the-select-element/select-validity.html", - "url": "/html/semantics/forms/the-select-element/select-validity.html" - } - ], "html/semantics/forms/the-textarea-element/cloning-steps.html": [ { "path": "html/semantics/forms/the-textarea-element/cloning-steps.html", diff --git a/testing/web-platform/tests/html/semantics/forms/the-select-element/select-validity.html b/testing/web-platform/tests/html/semantics/forms/the-select-element/select-validity.html deleted file mode 100644 index 21c39e379196..000000000000 --- a/testing/web-platform/tests/html/semantics/forms/the-select-element/select-validity.html +++ /dev/null @@ -1,99 +0,0 @@ - - -HTMLSelectElement.checkValidity - - - -
-