Backed out changeset 4b3945b75889 (bug 1550561) for causing conflicts at bug 1521280
authorCoroiu Cristina <ccoroiu@mozilla.com>
Mon, 13 May 2019 08:46:52 +0300
changeset 532387 b5ed012d2b538f0523f76c7885ae3a9c2944b515
parent 532386 e5562f9f81cac49cef56b436477b001cb027b9b4
child 532388 fa3cfee27619ddc9bcbcf70555bda4eb1e815146
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1550561, 1521280
milestone68.0a1
backs out4b3945b758896f5153e61a1b84a2b3614a98021a
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 4b3945b75889 (bug 1550561) for causing conflicts at bug 1521280
toolkit/content/editMenuOverlay.js
toolkit/content/tests/chrome/file_edit_contextmenu.xul
toolkit/content/tests/chrome/test_edit_contextmenu.html
--- a/toolkit/content/editMenuOverlay.js
+++ b/toolkit/content/editMenuOverlay.js
@@ -59,17 +59,17 @@ window.addEventListener("DOMContentLoade
 }, { once: true });
 
 // Support context menus on html textareas in the parent process:
 window.addEventListener("contextmenu", (e) => {
   const HTML_NS = "http://www.w3.org/1999/xhtml";
   // Note that there's not a risk of e.target being XBL anonymous content for <textbox> (which manages
   // its own context menu), because e.target will be the XBL binding parent in that case.
   let needsContextMenu = e.target.ownerDocument == document && !e.defaultPrevented && (
-    (["textarea", "input"].includes(e.target.localName) && e.target.namespaceURI == HTML_NS)
+    (e.target.localName == "textarea" && e.target.namespaceURI == HTML_NS)
     || e.target.closest("textbox[is='search-textbox']")
   );
 
   if (!needsContextMenu) {
     return;
   }
 
   let popup = document.getElementById("textbox-contextmenu");
--- a/toolkit/content/tests/chrome/file_edit_contextmenu.xul
+++ b/toolkit/content/tests/chrome/file_edit_contextmenu.xul
@@ -19,12 +19,12 @@
   <command id="cmd_copy" oncommand="goDoCommand('cmd_copy')"/>
   <command id="cmd_paste" oncommand="goDoCommand('cmd_paste')"/>
   <command id="cmd_delete" oncommand="goDoCommand('cmd_delete')"/>
   <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')"/>
   <command id="cmd_switchTextDirection" oncommand="goDoCommand('cmd_switchTextDirection');"/>
 </commandset>
 
 <html:textarea />
-<html:input />
+
 <textbox is="search-textbox"/>
 
 </window>
--- a/toolkit/content/tests/chrome/test_edit_contextmenu.html
+++ b/toolkit/content/tests/chrome/test_edit_contextmenu.html
@@ -16,17 +16,16 @@ https://bugzilla.mozilla.org/show_bug.cg
 
     async function runTest() {
       let win = window.open("file_edit_contextmenu.xul", "context-menu", "chrome,width=600,height=600");
       await new Promise(r => win.addEventListener("load", r, { once: true}));
       await SimpleTest.promiseFocus(win);
 
       const elements = [
         win.document.querySelector("textarea"),
-        win.document.querySelector("input"),
         win.document.querySelector("textbox[is='search-textbox']"),
       ];
       for (const element of elements) {
         await testElement(element, win);
       }
       SimpleTest.finish();
     }