Backed out changeset a6b4d5fa8ef6 (bug 677372) for causing test failures like in browser_bug409481.js
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 14 Jul 2016 14:12:55 +0200
changeset 330052 22010b91698c2ad3fe74b165883041eee22f67d0
parent 330051 f7e309f6467061ed9dea3516ceab9a951f3aa31e
child 330053 04a72d8ca78024c5fd5d8b9880d958486363119a
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs677372, 409481
milestone50.0a1
backs outa6b4d5fa8ef63f0f46240d4b4afdbd5927277105
Backed out changeset a6b4d5fa8ef6 (bug 677372) for causing test failures like in browser_bug409481.js
browser/base/content/test/general/contextmenu_common.js
--- a/browser/base/content/test/general/contextmenu_common.js
+++ b/browser/base/content/test/general/contextmenu_common.js
@@ -237,17 +237,16 @@ let lastElementSelector = null;
  *                 the element, optional
  *        offsetY: vertical mouse offset from the top-left corner of the
  *                 element, optional
  *        centered: if true, mouse position is centered in element, defaults
  *                  to true if offsetX and offsetY are not provided
  *        waitForSpellCheck: wait until spellcheck is initialized before
  *                           starting test
  *        preCheckContextMenuFn: callback to run before opening menu
- *        onContextMenuShown: callback to run when the context menu is shown
  *        postCheckContextMenuFn: callback to run after opening menu
  * @return {Promise} resolved after the test finishes
  */
 function* test_contextmenu(selector, menuItems, options={}) {
   contextMenu = document.getElementById("contentAreaContextMenu");
   is(contextMenu.state, "closed", "checking if popup is closed");
 
   // Default to centered if no positioning is defined.
@@ -291,21 +290,16 @@ function* test_contextmenu(selector, men
       button: 2,
       shiftkey: options.shiftkey,
       centered: options.centered
     },
     gBrowser.selectedBrowser);
   yield awaitPopupShown;
   info("Popup Shown");
 
-  if (options.onContextMenuShown) {
-    yield options.onContextMenuShown();
-    info("Completed onContextMenuShown");
-  }
-
   if (menuItems) {
     if (Services.prefs.getBoolPref("devtools.inspector.enabled")) {
       let inspectItems = ["---", null,
                           "context-inspect", true];
       menuItems = menuItems.concat(inspectItems);
     }
 
     checkContextMenu(menuItems);