Backed out changeset a512c178c19b (bug 1439472) for causing bug 1442101. a=backout
authorCiure Andrei <aciure@mozilla.com>
Fri, 02 Mar 2018 14:25:33 +0200
changeset 762516 bddc2ca6492179e4b287c3c05f249bba1350e8ef
parent 762469 b2a9a4bb5c94de179ae7a3f52fde58c0e2897498
child 762517 cf0e2bd94b8b638e694e6bd36d6a554a771d5138
child 762522 90801d55d597af33c538999b6c16110e4472188c
child 762529 d45c6bb2e78b2dfcfdb0dc22fc98e61f5fb55a24
child 762536 950a0d21de21697ac646aa63260f47b928627dcf
child 762555 dd16bd9931c83b851c35991c6ee6c44a2e320492
child 762581 e8d2cd63ee15c442e02d7fad094b49739d7cf5af
child 762613 e1327304773f521e8decb2a450edac26e4c24b70
child 762701 f48fea0ec80111888ecaaacc7fd2e6759b7ab8af
child 762957 0e62299bca5136f1d7b9fd75d6c79da485d5f19d
child 762959 feca678bda93815185bca005454c79626152d20a
child 762960 3ed654406254f2ec296a8b8791717e746be045c6
child 763019 4faffe83f2bcaf153530d374c8938d0ee10bfd43
child 763113 5c16e808abf280b0bc60a5d25986f57f1ae52c96
child 763153 fece4cbcd13ed6deeddd60a46e92c8993ec875de
push id101187
push userpaolo.mozmail@amadzone.org
push dateFri, 02 Mar 2018 15:39:17 +0000
reviewersbackout
bugs1439472, 1442101
milestone60.0a1
backs outa512c178c19ba8867d636188c5e56c943710a7d5
Backed out changeset a512c178c19b (bug 1439472) for causing bug 1442101. a=backout
browser/components/extensions/test/browser/head.js
--- a/browser/components/extensions/test/browser/head.js
+++ b/browser/components/extensions/test/browser/head.js
@@ -10,17 +10,17 @@
  *          promisePopupShown promisePopupHidden
  *          openContextMenu closeContextMenu
  *          openContextMenuInSidebar openContextMenuInPopup
  *          openExtensionContextMenu closeExtensionContextMenu
  *          openActionContextMenu openSubmenu closeActionContextMenu
  *          openTabContextMenu closeTabContextMenu
  *          openToolsMenu closeToolsMenu
  *          imageBuffer imageBufferFromDataURI
- *          getListStyleImage getPanelForNode getPanelViewForNode
+ *          getListStyleImage getPanelForNode
  *          awaitExtensionPanel awaitPopupResize
  *          promiseContentDimensions alterContent
  *          promisePrefChangeObserved openContextMenuInFrame
  *          promiseAnimationFrame getCustomizableUIPanelID
  *          awaitEvent BrowserWindowIterator
  */
 
 // There are shutdown issues for which multiple rejections are left uncaught.
@@ -196,51 +196,33 @@ function alterContent(browser, task, arg
 
 function getPanelForNode(node) {
   while (node.localName != "panel") {
     node = node.parentNode;
   }
   return node;
 }
 
-function getPanelViewForNode(node) {
-  while (node && node.localName != "panelview") {
-    node = node.parentNode;
-  }
-  return node;
-}
-
 var awaitBrowserLoaded = browser => ContentTask.spawn(browser, null, () => {
   if (content.document.readyState !== "complete" ||
       content.document.documentURI === "about:blank") {
     return ContentTaskUtils.waitForEvent(this, "load", true, event => {
       return content.document.documentURI !== "about:blank";
     }).then(() => {});
   }
 });
 
 var awaitExtensionPanel = async function(extension, win = window, awaitLoad = true) {
   let {originalTarget: browser} = await BrowserTestUtils.waitForEvent(
     win.document, "WebExtPopupLoaded", true,
     event => event.detail.extension.id === extension.id);
 
-  let panelview = getPanelViewForNode(browser);
-  let viewShownPromise = null;
-  if (panelview) {
-    let view = PanelView.forNode(panelview);
-    if (!view.active) {
-      viewShownPromise = BrowserTestUtils.waitForEvent(panelview, "ViewShown");
-    }
-  }
-
   await Promise.all([
     promisePopupShown(getPanelForNode(browser)),
 
-    viewShownPromise,
-
     awaitLoad && awaitBrowserLoaded(browser),
   ]);
 
   return browser;
 };
 
 function getCustomizableUIPanelID() {
   return CustomizableUI.AREA_FIXED_OVERFLOW_PANEL;