Backed out changeset 6de16b8f63dc (bug 1388832) for failing browser-chrome's browser/components/customizableui/test/browser_customization_context_menus.js. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 20 Sep 2017 20:45:48 +0200
changeset 431588 f39c3b2da2d12890a0c1d11b217a90f22fb1d9ce
parent 431587 072a236f67fe85171955a001ef3ee12fb830365f
child 431589 ef94a037bab9ad9bee020c25e2e89c6338027c23
push id7785
push userryanvm@gmail.com
push dateThu, 21 Sep 2017 13:39:55 +0000
treeherdermozilla-beta@06d4034a8a03 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1388832
milestone57.0a1
backs out6de16b8f63dcd2667b307ccb9d2c44783fb646f4
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 6de16b8f63dc (bug 1388832) for failing browser-chrome's browser/components/customizableui/test/browser_customization_context_menus.js. r=backout
browser/base/content/browser.js
browser/themes/shared/customizableui/panelUI.inc.css
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5423,18 +5423,25 @@ function onViewToolbarsPopupShowing(aEve
   }
 
   // triggerNode can be a nested child element of a toolbaritem.
   let toolbarItem = popup.triggerNode;
 
   if (toolbarItem && toolbarItem.localName == "toolbarpaletteitem") {
     toolbarItem = toolbarItem.firstChild;
   } else if (toolbarItem && toolbarItem.localName != "toolbar") {
-    toolbarItem = toolbarItem.closest(
-      ".customization-target, [overflowfortoolbar], toolbarpaletteitem, toolbar");
+    while (toolbarItem && toolbarItem.parentNode) {
+      let parent = toolbarItem.parentNode;
+      if ((parent.classList && parent.classList.contains("customization-target")) ||
+          parent.getAttribute("overflowfortoolbar") || // Needs to work in the overflow list as well.
+          parent.localName == "toolbarpaletteitem" ||
+          parent.localName == "toolbar")
+        break;
+      toolbarItem = parent;
+    }
   } else {
     toolbarItem = null;
   }
 
   let showTabStripItems = toolbarItem && toolbarItem.id == "tabbrowser-tabs";
   for (let node of popup.querySelectorAll('menuitem[contexttype="toolbaritem"]')) {
     node.hidden = showTabStripItems;
   }
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -1617,18 +1617,18 @@ toolbarpaletteitem[place="palette"] > .t
 #bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menu-dropmarker,
 #bookmarks-menu-button[overflowedItem] > .toolbarbutton-menu-dropmarker,
 toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
 #bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menubutton-dropmarker {
   display: none;
 }
 
 #search-container[cui-areatype="menu-panel"] {
-  padding-top: 6px;
-  padding-bottom: 6px;
+  margin-top: 6px;
+  margin-bottom: 6px;
 }
 
 toolbarpaletteitem[place="palette"] > #search-container {
   min-width: 7em;
   width: 7em;
   min-height: 37px;
 }