Backed out changeset 467b0d255265 (bug 1272012)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 25 May 2016 13:21:32 +0200
changeset 337944 19753db8aa952efa4e88bee67e118f7188467684
parent 337943 035a7be9628ac2a47a527854dce55c7f02e69c6a
child 337945 dd37cbc7e54337e7048e8aea6a9091798a6398e3
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1272012
milestone49.0a1
backs out467b0d255265f75f321f2b45e92495a902f20b5e
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
Backed out changeset 467b0d255265 (bug 1272012)
accessible/tests/mochitest/events/a11y.ini
dom/html/test/test_bug615833.html
layout/forms/test/mochitest.ini
layout/forms/test/test_bug672810.html
layout/forms/test/test_bug935876.html
layout/forms/test/test_bug961363.html
layout/forms/test/test_select_prevent_default.html
--- a/accessible/tests/mochitest/events/a11y.ini
+++ b/accessible/tests/mochitest/events/a11y.ini
@@ -45,20 +45,18 @@ skip-if = os == 'win' || os == 'linux'
 [test_menu.xul]
 [test_mutation.html]
 [test_mutation.xhtml]
 [test_namechange.xul]
 [test_namechange.html]
 [test_scroll.xul]
 [test_scroll_caret.xul]
 [test_selection.html]
-skip-if = buildapp == 'mulet' || os == 'mac'
+skip-if = buildapp == 'mulet'
 [test_selection.xul]
-skip-if = os == 'mac'
 [test_selection_aria.html]
 [test_statechange.html]
 [test_text.html]
 [test_text_alg.html]
 [test_textattrchange.html]
 [test_textselchange.html]
 [test_tree.xul]
 [test_valuechange.html]
-skip-if = os == 'mac'
--- a/dom/html/test/test_bug615833.html
+++ b/dom/html/test/test_bug615833.html
@@ -68,31 +68,23 @@ selectMultiple.addEventListener("focus",
 select.addEventListener("change", function(aEvent) {
   select.removeEventListener("change", arguments.callee, false);
   checkChangeEvent(aEvent);
   selectMultiple.focus();
 }, false);
 
 select.addEventListener("keyup", function() {
   select.removeEventListener("keyup", arguments.callee, false);
-  if (navigator.platform.indexOf("Mac") == -1) {
-    select.blur(); // trigger the change
-  }
+  select.blur();
 }, false);
 
 select.addEventListener("focus", function() {
   select.removeEventListener("focus", arguments.callee, false);
   SimpleTest.executeSoon(function () {
-    if (navigator.platform.indexOf("Mac") == 0) {
-      synthesizeKey("VK_DOWN", {}); // open the dropdown menu
-      synthesizeKey("VK_DOWN", {}); // select next option
-      synthesizeKey("VK_RETURN", {}); // trigger the change, close the menu
-    } else {
-      synthesizeKey("VK_DOWN", {}); // select next option (w. closed menu)
-    }
+    synthesizeKey("VK_DOWN", {});
   });
 }, false);
 
 checkbox.addEventListener("change", function(aEvent) {
   checkbox.removeEventListener("change", arguments.callee, false);
   checkChangeEvent(aEvent);
   select.focus();
 }, false);
--- a/layout/forms/test/mochitest.ini
+++ b/layout/forms/test/mochitest.ini
@@ -5,17 +5,17 @@ support-files =
   bug564115_window.html
 
 [test_bug231389.html]
 [test_bug287446.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #bug 947789
 [test_bug345267.html]
 [test_bug346043.html]
 [test_bug348236.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s || os == 'mac' # b2g(select form control popup) b2g-debug(select form control popup) b2g-desktop(select form control popup) mac(select form control popup behavior is different)
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(select form control popup) b2g-debug(select form control popup) b2g-desktop(select form control popup)
 [test_bug353539.html]
 [test_bug365410.html]
 [test_bug378670.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug402198.html]
 [test_bug411236.html]
 [test_bug446663.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(needs copy support) b2g-debug(needs copy support) b2g-desktop(needs copy support)
--- a/layout/forms/test/test_bug672810.html
+++ b/layout/forms/test/test_bug672810.html
@@ -86,34 +86,30 @@ SimpleTest.waitForFocus(function() {
     ok(!s[1].selected,s.id + ": CTRL+SHIFT+DOWN deselected 2nd option");
     synthesizeKey(' ', {ctrlKey: true, shiftKey: true});
     is(s.selectedIndex,3, s.id + ": 4th option is still selected");
     synthesizeKey(' ', {ctrlKey: true, shiftKey: true});
     is(s.selectedIndex,3, s.id + ": 4th option is still selected");
     setTimeout(function(){sel[2].focus()},0);
   }, false);
   sel[2].addEventListener('focus', function() {
-    if (navigator.platform.indexOf("Mac") == -1) {
-      s = sel[2];
-      s.removeEventListener('focus', arguments.callee, false);
-      synthesizeKey('VK_DOWN', {});
-      is(s.selectedIndex,1, s.id + ": initial DOWN selects 2nd option");
-      synthesizeKey('VK_DOWN', {ctrlKey: true});
-      is(s.selectedIndex,2, s.id + ": 3rd option is selected");
-      ok(!s[1].selected,s.id + ": CTRL+DOWN deselected 2nd option");
-      synthesizeKey('VK_DOWN', {ctrlKey: true, shiftKey: true});
-      is(s.selectedIndex,3, s.id + ": 4th option is selected");
-      ok(!s[2].selected,s.id + ": CTRL+SHIFT+DOWN deselected 3rd option");
-      synthesizeKey(' ', {ctrlKey: true, shiftKey: true});
-      is(s.selectedIndex,3, s.id + ": 4th option is still selected");
-      synthesizeKey(' ', {ctrlKey: true, shiftKey: true});
-      is(s.selectedIndex,3, s.id + ": 4th option is still selected");
-    } else {
-      todo(false, "Make this test work on OSX");
-    }
+    s = sel[2];
+    s.removeEventListener('focus', arguments.callee, false);
+    synthesizeKey('VK_DOWN', {});
+    is(s.selectedIndex,1, s.id + ": initial DOWN selects 2nd option");
+    synthesizeKey('VK_DOWN', {ctrlKey: true});
+    is(s.selectedIndex,2, s.id + ": 3rd option is selected");
+    ok(!s[1].selected,s.id + ": CTRL+DOWN deselected 2nd option");
+    synthesizeKey('VK_DOWN', {ctrlKey: true, shiftKey: true});
+    is(s.selectedIndex,3, s.id + ": 4th option is selected");
+    ok(!s[2].selected,s.id + ": CTRL+SHIFT+DOWN deselected 3rd option");
+    synthesizeKey(' ', {ctrlKey: true, shiftKey: true});
+    is(s.selectedIndex,3, s.id + ": 4th option is still selected");
+    synthesizeKey(' ', {ctrlKey: true, shiftKey: true});
+    is(s.selectedIndex,3, s.id + ": 4th option is still selected");
     setTimeout(function(){SimpleTest.finish()},0);
   }, false);
   sel[0].focus();
 });
 
 </script>
 </pre>
 </body>
--- a/layout/forms/test/test_bug935876.html
+++ b/layout/forms/test/test_bug935876.html
@@ -266,30 +266,26 @@ function runTests()
   combobox.addEventListener("keydown", onKeydown, false);
   combobox.addEventListener("keypress", onKeypress, false);
   SpecialPowers.addSystemEventListener(combobox, "keydown", onkeydownInSystemEventGroup, false);
 
   combobox.focus();
 
   [ false, true ].forEach(function (consume) {
     doPreventDefault = consume;
-    if (!kIsMac) {
-      for (var i = 0; i < combobox.options.length + 1; i++) {
-        reset()
-        synthesizeKey("VK_DOWN", {});
-        check(true, "DownArrow key on combobox #" + i);
-      }
+    for (var i = 0; i < combobox.options.length + 1; i++) {
+      reset()
+      synthesizeKey("VK_DOWN", {});
+      check(true, "DownArrow key on combobox #" + i);
+    }
 
-      for (var i = 0; i < combobox.options.length + 1; i++) {
-        reset()
-        synthesizeKey("VK_UP", {});
-        check(true, "UpArrow key on combobox #" + i);
-      }
-    } else {
-      todo(false, "Make this test work on OSX");
+    for (var i = 0; i < combobox.options.length + 1; i++) {
+      reset()
+      synthesizeKey("VK_UP", {});
+      check(true, "UpArrow key on combobox #" + i);
     }
 
     for (var i = 0; i < combobox.options.length + 1; i++) {
       reset()
       synthesizeKey("VK_RIGHT", {});
       check(true, "RightArrow key on combobox #" + i);
     }
 
--- a/layout/forms/test/test_bug961363.html
+++ b/layout/forms/test/test_bug961363.html
@@ -44,22 +44,18 @@ https://bugzilla.mozilla.org/show_bug.cg
           var sel = Array.prototype.slice.call(element.options).map(function(o){return o.selected})
           is(""+sel, ""+data.s, "selected options match after CTRL+SPACE (after testing CTRL+key " + key + ") for (id: " + id + ")");
           previousValue = element.value;
           });
       };
       select_test("one", one, false);
       select_test("two", two_1, true);
       select_test("two", two_2, false);
-      if (navigator.platform.indexOf("Mac") == -1) {
-        select_test("three", three_1, true);
-        select_test("three", three_2, false);
-      } else {
-        todo(false, "Make these tests work on OSX");
-      }
+      select_test("three", three_1, true);
+      select_test("three", three_2, false);
       SimpleTest.finish();
     });
   }
 </script>
 </head>
 <body onload="test();">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=961363">Mozilla Bug 961363</a>
 <div>
--- a/layout/forms/test/test_select_prevent_default.html
+++ b/layout/forms/test/test_select_prevent_default.html
@@ -24,21 +24,16 @@ https://bugzilla.mozilla.org/show_bug.cg
     SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, runTest);
   }
 
   function runTest() {
     document.getElementById("keydown").addEventListener("keydown", preventDefault);
     document.getElementById("keypress").addEventListener("keypress", preventDefault);
 
     SimpleTest.waitForFocus(function() {
-      if (navigator.platform.indexOf("Mac") == 0) {
-        todo(false, "Make this test work on OSX");
-        SimpleTest.finish();
-        return;
-      }
       var testData = [ "one", "two", "three", "four", "keydown", "keypress" ];
 
       // The order of the keys in otherKeys is important for the test to function properly.
       var otherKeys = [ "DOWN", "UP", "RIGHT", "LEFT", "PAGE_DOWN", "PAGE_UP",
                         "END", "HOME" ];
 
       testData.forEach(function(id) {
         var element = document.getElementById(id);