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 461277 bddc2ca6492179e4b287c3c05f249bba1350e8ef
parent 461271 b2a9a4bb5c94de179ae7a3f52fde58c0e2897498
child 461278 dd16bd9931c83b851c35991c6ee6c44a2e320492
child 461285 950a0d21de21697ac646aa63260f47b928627dcf
child 461320 e1327304773f521e8decb2a450edac26e4c24b70
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1439472, 1442101
milestone60.0a1
backs outa512c178c19ba8867d636188c5e56c943710a7d5
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 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;