Back out 574a93c36fd8 (bug 1203668) for Moth bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Sat, 12 Sep 2015 08:23:23 -0700
changeset 294771 3de175bd4e83775e35077d71167967fa457d0e0a
parent 294770 e668e5f2fb8ab962908d4903662ede26ba9b6868
child 294772 63f3a49b15cbce9c99a4ba7f8fce2602dfc0b3ed
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1203668
milestone43.0a1
backs out574a93c36fd8ac5bc9f803f622b30f472b8be0b0
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 574a93c36fd8 (bug 1203668) for Moth bustage CLOSED TREE
dom/html/HTMLSelectElement.cpp
dom/html/test/mochitest.ini
dom/html/test/test_bug1203668.html
--- a/dom/html/HTMLSelectElement.cpp
+++ b/dom/html/HTMLSelectElement.cpp
@@ -1196,21 +1196,19 @@ HTMLSelectElement::SetValue(const nsAStr
     if (!option) {
       continue;
     }
 
     nsAutoString optionVal;
     option->GetValue(optionVal);
     if (optionVal.Equals(aValue)) {
       SetSelectedIndexInternal(int32_t(i), true);
-      return NS_OK;
+      break;
     }
   }
-  // No matching option was found.
-  SetSelectedIndexInternal(-1, true);
   return NS_OK;
 }
 
 
 NS_IMPL_BOOL_ATTR(HTMLSelectElement, Autofocus, autofocus)
 NS_IMPL_BOOL_ATTR(HTMLSelectElement, Disabled, disabled)
 NS_IMPL_BOOL_ATTR(HTMLSelectElement, Multiple, multiple)
 NS_IMPL_STRING_ATTR(HTMLSelectElement, Name, name)
--- a/dom/html/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@@ -588,9 +588,8 @@ support-files = file_bug871161-1.html fi
 [test_hash_encoded.html]
 [test_bug1081037.html]
 [test_window_open_close.html]
 skip-if = buildapp == 'b2g' # bug 1129014
 [test_img_complete.html]
 [test_viewport_resize.html]
 [test_extapp.html]
 [test_image_clone_load.html]
-[test_bug1203668.html]
deleted file mode 100644
--- a/dom/html/test/test_bug1203668.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1203668
--->
-<head>
-  <title>Test for Bug 1203668</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1203668">Mozilla Bug 1203668</a>
-<p id="display"></p>
-<div id="content">
-  <select class="select" multiple>
-    <option value="foo" selected>foo</option>
-    <option value="bar" selected>bar</option>
-  </select>
-  <select class="select" multiple>
-    <option value="foo">foo</option>
-    <option value="bar" selected>bar</option>
-  </select>
-  <select class="select" multiple>
-    <option value="foo">foo</option>
-    <option value="bar">bar</option>
-  </select>
-  <select class="select" size=1>
-    <option value="foo">foo</option>
-    <option value="bar" selected>bar</option>
-  </select>
-  <select class="select" size=1>
-    <option value="foo">foo</option>
-    <option value="bar">bar</option>
-  </select>
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 1203668 **/
-
-SimpleTest.waitForExplicitFinish();
-
-function runTest()
-{
-  var selects = document.querySelectorAll('.select');
-  for (i=0; i < selects.length; i++) {
-    var select = selects[i];
-    select.value = "bogus"
-    is(select.selectedIndex, -1, "no option is selected");
-    is(select.children[0].selected, false, "first option is not selected");
-    is(select.children[1].selected, false, "second option is not selected");
-  }
-
-  SimpleTest.finish();
-}
-
-SimpleTest.waitForFocus(runTest);
-
-</script>
-</pre>
-</body>
-</html>