Backed out 2 changesets (bug 1513332, bug 1445942) for browser-chrome…

… failures in browser/base/content/test/permissions/browser_reservedkey.js Backed out changeset 648648a60190 (bug 1445942) Backed out changeset 003adae62f33 (bug 1513332)
Brli · Dec 17, 2018 · a5d4c72 · a5d4c72
1 parent 26eff14
commit a5d4c72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 44 deletions.
diff --git a/accessible/xul/XULListboxAccessible.cpp b/accessible/xul/XULListboxAccessible.cpp
@@ -111,13 +111,9 @@ void XULListboxAccessible::Value(nsString& aValue) const {
     RefPtr<Element> element;
     select->GetSelectedItem(getter_AddRefs(element));
 
-    if (element) {
-      nsCOMPtr<nsIDOMXULSelectControlItemElement> selectedItem =
-          element->AsXULSelectControlItem();
-      if (selectedItem) {
-        selectedItem->GetLabel(aValue);
-      }
-    }
+    nsCOMPtr<nsIDOMXULSelectControlItemElement> selectedItem =
+        element->AsXULSelectControlItem();
+    if (selectedItem) selectedItem->GetLabel(aValue);
   }
 }
 
@@ -180,9 +176,6 @@ bool XULListboxAccessible::IsRowSelected(uint32_t aRowIdx) {
   RefPtr<Element> element;
   nsresult rv = control->GetItemAtIndex(aRowIdx, getter_AddRefs(element));
   NS_ENSURE_SUCCESS(rv, false);
-  if (!element) {
-    return false;
-  }
 
   nsCOMPtr<nsIDOMXULSelectControlItemElement> item =
       element->AsXULSelectControlItem();
@@ -344,9 +337,6 @@ void XULListboxAccessible::SelectRow(uint32_t aRowIdx) {
 
   RefPtr<Element> item;
   control->GetItemAtIndex(aRowIdx, getter_AddRefs(item));
-  if (!item) {
-    return;
-  }
 
   nsCOMPtr<nsIDOMXULSelectControlItemElement> itemElm =
       item->AsXULSelectControlItem();
@@ -361,9 +351,6 @@ void XULListboxAccessible::UnselectRow(uint32_t aRowIdx) {
 
   RefPtr<Element> item;
   control->GetItemAtIndex(aRowIdx, getter_AddRefs(item));
-  if (!item) {
-    return;
-  }
 
   nsCOMPtr<nsIDOMXULSelectControlItemElement> itemElm =
       item->AsXULSelectControlItem();

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
@@ -182,8 +182,8 @@
     <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
     <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
 
-    <key keycode="VK_BACK" command="cmd_handleBackspace" reserved="false"/>
-    <key keycode="VK_BACK" command="cmd_handleShiftBackspace" modifiers="shift" reserved="false"/>
+    <key keycode="VK_BACK" command="cmd_handleBackspace"/>
+    <key keycode="VK_BACK" command="cmd_handleShiftBackspace" modifiers="shift"/>
 #ifndef XP_MACOSX
     <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="alt"/>
     <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="alt"/>

diff --git a/browser/base/content/test/permissions/browser_reservedkey.js b/browser/base/content/test/permissions/browser_reservedkey.js
@@ -117,29 +117,3 @@ if (!navigator.platform.includes("Mac")) {
     BrowserTestUtils.removeTab(tab1);
   });
 }
-
-// There is a <key> element for Backspace with reserved="false", so make sure that it is not
-// treated as a blocked shortcut key.
-add_task(async function test_backspace() {
-  await new Promise(resolve => {
-    SpecialPowers.pushPrefEnv({"set": [["permissions.default.shortcuts", 2]]}, resolve);
-  });
-
-  // The input field is autofocused. If this test fails, backspace can go back
-  // in history so cancel the beforeunload event and adjust the field to make the test fail.
-  const uri = "data:text/html,<body onbeforeunload='document.getElementById('field').value = 'failed'; event.preventDefault();'>" +
-              "<input id='field' value='something' autofocus></body>";
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, uri);
-
-  // Move the caret so backspace will go delete the first character.
-  EventUtils.synthesizeKey("KEY_ArrowRight", {});
-  EventUtils.synthesizeKey("KEY_Backspace", {});
-
-  let fieldValue = await ContentTask.spawn(tab.linkedBrowser, { }, async function() {
-    return content.document.getElementById("field").value;
-  });
-  is(fieldValue, "omething", "backspace not prevented");
-
-  BrowserTestUtils.removeTab(tab);
-});
-