Backed out 2 changesets (bug 968891, bug 966599) for mochitest-bc failures on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 07 Feb 2014 14:38:47 -0500
changeset 184791 6330fb0cb998f95e4778abdddfdcbe8fd5a9d16f
parent 184790 5a6305a56957b052a92e9b8ba736d90af02606a9
child 184792 949b41f324da1175601256ed4b785d1470f73287
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs968891, 966599
milestone30.0a1
backs out718ba55ff17540c57124e5218571c0f71b925abe
0a8f966b8332c882e5000247d640afd1c81d5776
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 2 changesets (bug 968891, bug 966599) for mochitest-bc failures on a CLOSED TREE. Backed out changeset 718ba55ff175 (bug 968891) Backed out changeset 0a8f966b8332 (bug 966599)
browser/components/customizableui/src/CustomizableUI.jsm
browser/components/customizableui/src/CustomizeMode.jsm
browser/components/customizableui/test/browser_877178_unregisterArea.js
browser/components/customizableui/test/browser_888817_currentset_updating.js
browser/components/customizableui/test/browser_938980_navbar_collapsed.js
browser/components/customizableui/test/browser_940013_registerToolbarNode_calls_registerArea.js
browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -165,81 +165,65 @@ let CustomizableUIInternal = {
     if (showCharacterEncoding == "true") {
       panelPlacements.push("characterencoding-button");
     }
 
     this.registerArea(CustomizableUI.AREA_PANEL, {
       anchor: "PanelUI-menu-button",
       type: CustomizableUI.TYPE_MENU_PANEL,
       defaultPlacements: panelPlacements
-    }, true);
+    });
     PanelWideWidgetTracker.init();
 
     this.registerArea(CustomizableUI.AREA_NAVBAR, {
       legacy: true,
       type: CustomizableUI.TYPE_TOOLBAR,
       overflowable: true,
       defaultPlacements: [
         "urlbar-container",
         "search-container",
         "webrtc-status-button",
         "bookmarks-menu-button",
         "downloads-button",
         "home-button",
         "social-share-button",
-      ],
-      defaultCollapsed: false,
-    }, true);
+      ]
+    });
 #ifndef XP_MACOSX
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
       legacy: true,
       type: CustomizableUI.TYPE_TOOLBAR,
       defaultPlacements: [
         "menubar-items",
-      ],
-      get defaultCollapsed() {
-#ifdef MENUBAR_CAN_AUTOHIDE
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
-        return true;
-#endif
-#else
-        // This is duplicated logic from /browser/base/jar.mn
-        // for win6BrowserOverlay.xul.
-        return Services.appinfo.OS == "WINNT" &&
-               Services.sysinfo.getProperty("version") != "5.1";
-#endif
-      }
-    }, true);
+      ]
+    });
 #endif
     this.registerArea(CustomizableUI.AREA_TABSTRIP, {
       legacy: true,
       type: CustomizableUI.TYPE_TOOLBAR,
       defaultPlacements: [
         "tabbrowser-tabs",
         "new-tab-button",
         "alltabs-button",
         "tabs-closebutton",
-      ],
-      defaultCollapsed: false,
-    }, true);
+      ]
+    });
     this.registerArea(CustomizableUI.AREA_BOOKMARKS, {
       legacy: true,
       type: CustomizableUI.TYPE_TOOLBAR,
       defaultPlacements: [
         "personal-bookmarks",
-      ],
-      defaultCollapsed: true,
-    }, true);
+      ]
+    });
 
     this.registerArea(CustomizableUI.AREA_ADDONBAR, {
       type: CustomizableUI.TYPE_TOOLBAR,
       legacy: true,
-      defaultPlacements: ["addonbar-closebutton", "status-bar"],
-      defaultCollapsed: false,
-    }, true);
+      defaultPlacements: ["addonbar-closebutton", "status-bar"]
+    });
   },
 
   _defineBuiltInWidgets: function() {
     //XXXunf Need to figure out how to auto-add new builtin widgets in new
     //       app versions to already customized areas.
     for (let widgetDefinition of CustomizableWidgets) {
       this.createBuiltinWidget(widgetDefinition);
     }
@@ -265,17 +249,17 @@ let CustomizableUIInternal = {
     }
 
     // PROVIDER_SPECIAL gets treated the same as PROVIDER_XUL.
     let wrapper = new XULWidgetGroupWrapper(aWidgetId);
     gGroupWrapperCache.set(aWidgetId, wrapper);
     return wrapper;
   },
 
-  registerArea: function(aName, aProperties, aInternalCaller) {
+  registerArea: function(aName, aProperties) {
     if (typeof aName != "string" || !/^[a-z0-9-_]{1,}$/i.test(aName)) {
       throw new Error("Invalid area name");
     }
 
     let areaIsKnown = gAreas.has(aName);
     let props = areaIsKnown ? gAreas.get(aName) : new Map();
     for (let key in aProperties) {
       //XXXgijs for special items, we need to make sure they have an appropriate ID
@@ -285,26 +269,16 @@ let CustomizableUIInternal = {
       } else {
         props.set(key, aProperties[key]);
       }
     }
     // Default to a toolbar:
     if (!props.has("type")) {
       props.set("type", CustomizableUI.TYPE_TOOLBAR);
     }
-    if (props.get("type") == CustomizableUI.TYPE_TOOLBAR) {
-      if (!aInternalCaller && props.has("defaultCollapsed")) {
-        throw new Error("defaultCollapsed is only allowed for default toolbars.")
-      }
-      if (!props.has("defaultCollapsed")) {
-        props.set("defaultCollapsed", true);
-      }
-    } else if (props.has("defaultCollapsed")) {
-      throw new Error("defaultCollapsed only applies for TYPE_TOOLBAR areas.");
-    }
     // Sanity check type:
     let allTypes = [CustomizableUI.TYPE_TOOLBAR, CustomizableUI.TYPE_MENU_PANEL];
     if (allTypes.indexOf(props.get("type")) == -1) {
       throw new Error("Invalid area type " + props.get("type"));
     }
 
     // And to no placements:
     if (!props.has("defaultPlacements")) {
@@ -2062,23 +2036,16 @@ let CustomizableUIInternal = {
     }
 
     // Rebuild each registered area (across windows) to reflect the state that
     // was reset above.
     for (let [areaId, areaNodes] of gBuildAreas) {
       let placements = gPlacements.get(areaId);
       for (let areaNode of areaNodes) {
         this.buildArea(areaId, placements, areaNode);
-
-        let area = gAreas.get(areaId);
-        if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
-          let defaultCollapsed = area.get("defaultCollapsed");
-          let win = areaNode.ownerDocument.defaultView;
-          win.setToolbarVisibility(areaNode, !defaultCollapsed);
-        }
       }
     }
     gResetting = false;
   },
 
   /**
    * @param {String|Node} aWidget - widget ID or a widget node (preferred for performance).
    * @return {Boolean} whether the widget is removable
@@ -2191,26 +2158,16 @@ let CustomizableUIInternal = {
         } else {
           // Clone the array so we don't modify the actual placements...
           currentPlacements = [...currentPlacements];
           currentPlacements = currentPlacements.filter((item) => {
             let itemNode = container.getElementsByAttribute("id", item)[0];
             return itemNode && removableOrDefault(itemNode || item);
           });
         }
-
-        if (props.get("type") == CustomizableUI.TYPE_TOOLBAR) {
-          let attribute = container.getAttribute("type") == "menubar" ? "autohide" : "collapsed";
-          let collapsed = container.getAttribute(attribute) == "true";
-          let defaultCollapsed = props.get("defaultCollapsed");
-          if (collapsed != defaultCollapsed) {
-            LOG("Found " + areaId + " had non-default toolbar visibility (expected " + defaultCollapsed + ", was " + collapsed + ")");
-            return false;
-          }
-        }
       }
       LOG("Checking default state for " + areaId + ":\n" + currentPlacements.join(",") +
           "\nvs.\n" + defaultPlacements.join(","));
 
       if (currentPlacements.length != defaultPlacements.length) {
         return false;
       }
 
@@ -2398,18 +2355,16 @@ this.CustomizableUI = {
    *                          anchoring node for the panel.
    *                - legacy: set to true if you want customizableui to
    *                          automatically migrate the currentset attribute
    *                - overflowable: set to true if your toolbar is overflowable.
    *                                This requires an anchor, and only has an
    *                                effect for toolbars.
    *                - defaultPlacements: an array of widget IDs making up the
    *                                     default contents of the area
-   *                - defaultCollapsed: (INTERNAL ONLY) applies if the type is TYPE_TOOLBAR, specifies
-   *                                    if toolbar is collapsed by default (default to true)
    */
   registerArea: function(aName, aProperties) {
     CustomizableUIInternal.registerArea(aName, aProperties);
   },
   /**
    * Register a concrete node for a registered area. This method is automatically
    * called from any toolbar in the main browser window that has its
    * "customizable" attribute set to true. There should normally be no need to
@@ -2779,26 +2734,16 @@ this.CustomizableUI = {
    * @return TYPE_TOOLBAR or TYPE_MENU_PANEL depending on the area, null if
    *         the area is unknown.
    */
   getAreaType: function(aArea) {
     let area = gAreas.get(aArea);
     return area ? area.get("type") : null;
   },
   /**
-   * Check if a toolbar is collapsed by default.
-   *
-   * @param aArea the ID of the area whose default-collapsed state you want to know.
-   * @return `true` or `false` depending on the area, null if the area is unknown.
-   */
-  isToolbarDefaultCollapsed: function(aArea) {
-    let area = gAreas.get(aArea);
-    return area ? area.get("defaultCollapsed") : null;
-  },
-  /**
    * Obtain the DOM node that is the customize target for an area in a
    * specific window.
    *
    * Areas can have a customization target that does not correspond to the
    * node itself. In particular, toolbars that have a customizationtarget
    * attribute set will have their customization target set to that node.
    * This means widgets will end up in the customization target, not in the
    * DOM node with the ID that corresponds to the area ID. This is useful
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -184,21 +184,16 @@ CustomizeMode.prototype = {
       // is really not going to work. We pass "true" to ensureRegistered to
       // indicate that we're handling calling startBatchUpdate and
       // endBatchUpdate.
       yield window.PanelUI.ensureReady(true);
 
       // Hide the palette before starting the transition for increased perf.
       this.visiblePalette.hidden = true;
 
-      // Disable the button-text fade-out mask
-      // during the transition for increased perf.
-      let panelContents = window.PanelUI.contents;
-      panelContents.setAttribute("customize-transitioning", "true");
-
       // Move the mainView in the panel to the holder so that we can see it
       // while customizing.
       let mainView = window.PanelUI.mainView;
       let panelHolder = document.getElementById("customization-panelHolder");
       panelHolder.appendChild(mainView);
 
       let customizeButton = document.getElementById("PanelUI-customize");
       customizeButton.setAttribute("enterLabel", customizeButton.getAttribute("label"));
@@ -253,18 +248,16 @@ CustomizeMode.prototype = {
       this._transitioning = false;
 
       // Show the palette now that the transition has finished.
       this.visiblePalette.hidden = false;
       this.paletteSpacer.hidden = true;
       this._updateEmptyPaletteNotice();
 
       this._handler.isEnteringCustomizeMode = false;
-      panelContents.removeAttribute("customize-transitioning");
-
       this.dispatchToolboxEvent("customizationready");
       if (!this._wantToBeInCustomizeMode) {
         this.exit();
       }
     }.bind(this)).then(null, function(e) {
       ERROR(e);
       // We should ensure this has been called, and calling it again doesn't hurt:
       window.PanelUI.endBatchUpdate();
@@ -302,21 +295,16 @@ CustomizeMode.prototype = {
     let document = this.document;
     let documentElement = document.documentElement;
 
     // Hide the palette before starting the transition for increased perf.
     this.paletteSpacer.hidden = false;
     this.visiblePalette.hidden = true;
     this.paletteEmptyNotice.hidden = true;
 
-    // Disable the button-text fade-out mask
-    // during the transition for increased perf.
-    let panelContents = window.PanelUI.contents;
-    panelContents.setAttribute("customize-transitioning", "true");
-
     this._transitioning = true;
 
     Task.spawn(function() {
       yield this.depopulatePalette();
 
       yield this._doTransition(false);
 
       let customizer = document.getElementById("customization-container");
@@ -360,18 +348,16 @@ CustomizeMode.prototype = {
       customizeButton.setAttribute("tooltiptext", customizeButton.getAttribute("enterTooltiptext"));
 
       // We have to use setAttribute/removeAttribute here instead of the
       // property because the XBL property will be set later, and right
       // now we'd be setting an expando, which breaks the XBL property.
       document.getElementById("PanelUI-help").removeAttribute("disabled");
       document.getElementById("PanelUI-quit").removeAttribute("disabled");
 
-      panelContents.removeAttribute("customize-transitioning");
-
       // We need to set this._customizing to false before removing the tab
       // or the TabSelect event handler will think that we are exiting
       // customization mode for a second time.
       this._customizing = false;
 
       let mainView = window.PanelUI.mainView;
       if (this._mainViewContext) {
         mainView.setAttribute("context", this._mainViewContext);
--- a/browser/components/customizableui/test/browser_877178_unregisterArea.js
+++ b/browser/components/customizableui/test/browser_877178_unregisterArea.js
@@ -34,17 +34,18 @@ add_task(function checkRegisteringAndUnr
   const kToolbarId = "test-registration-toolbar";
   const kButtonId = "test-registration-button";
   createDummyXULButton(kButtonId);
   createToolbarWithPlacements(kToolbarId, ["spring", kButtonId, "spring"]);
   assertAreaPlacements(kToolbarId,
                        [/customizableui-special-spring\d+/,
                         kButtonId,
                         /customizableui-special-spring\d+/]);
-  ok(!CustomizableUI.inDefaultState, "With a new toolbar it is no longer in a default state.");
+  ok(CustomizableUI.inDefaultState, "With a new toolbar and default placements, " +
+     "everything should still be in a default state.");
   removeCustomToolbars(); // Will call unregisterArea for us
   ok(CustomizableUI.inDefaultState, "When the toolbar is unregistered, " +
-     "everything will return to the default state.");
+     "everything should still be in a default state.");
 });
 
 add_task(function asyncCleanup() {
   yield resetCustomization();
 });
--- a/browser/components/customizableui/test/browser_888817_currentset_updating.js
+++ b/browser/components/customizableui/test/browser_888817_currentset_updating.js
@@ -1,20 +1,19 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 // Adding, moving and removing items should update the relevant currentset attributes
 add_task(function() {
-  ok(CustomizableUI.inDefaultState, "Should be in the default state when we start");
   let personalbar = document.getElementById(CustomizableUI.AREA_BOOKMARKS);
   setToolbarVisibility(personalbar, true);
-  ok(!CustomizableUI.inDefaultState, "Making the bookmarks toolbar visible takes it out of the default state");
+  ok(CustomizableUI.inDefaultState, "Should be in the default state when we start");
 
   let navbar = document.getElementById(CustomizableUI.AREA_NAVBAR);
   let personalbar = document.getElementById(CustomizableUI.AREA_BOOKMARKS);
   let navbarCurrentset = navbar.getAttribute("currentset") || navbar.currentSet;
   let personalbarCurrentset = personalbar.getAttribute("currentset") || personalbar.currentSet;
 
   let otherWin = yield openAndLoadWindow();
   let otherNavbar = otherWin.document.getElementById(CustomizableUI.AREA_NAVBAR);
--- a/browser/components/customizableui/test/browser_938980_navbar_collapsed.js
+++ b/browser/components/customizableui/test/browser_938980_navbar_collapsed.js
@@ -1,98 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-let bookmarksToolbar = document.getElementById("PersonalToolbar");
-let navbar = document.getElementById("nav-bar");
-let tabsToolbar = document.getElementById("TabsToolbar");
-
 // Customization reset should restore visibility to default-visible toolbars.
 add_task(function() {
+  let navbar = document.getElementById("nav-bar");
   is(navbar.collapsed, false, "Test should start with navbar visible");
-  setToolbarVisibility(navbar, false);
+  navbar.collapsed = true;
   is(navbar.collapsed, true, "navbar should be hidden now");
 
   yield resetCustomization();
 
   is(navbar.collapsed, false, "Customization reset should restore visibility to the navbar");
 });
-
-// Customization reset should restore collapsed-state to default-collapsed toolbars.
-add_task(function() {
-  ok(CustomizableUI.inDefaultState, "Everything should be in its default state");
-
-  is(bookmarksToolbar.collapsed, true, "Test should start with bookmarks toolbar collapsed");
-  is(bookmarksToolbar.getBoundingClientRect().height, 0, "bookmarksToolbar should have height=0");
-  isnot(tabsToolbar.getBoundingClientRect().height, 0, "TabsToolbar should have non-zero height");
-  is(navbar.collapsed, false, "The nav-bar should be shown by default");
-
-  setToolbarVisibility(bookmarksToolbar, true);
-  setToolbarVisibility(navbar, false);
-  isnot(bookmarksToolbar.getBoundingClientRect().height, 0, "bookmarksToolbar should be visible now");
-  is(navbar.getBoundingClientRect().height, 1, "navbar should have a height=1 (due to border)");
-  is(CustomizableUI.inDefaultState, false, "Should no longer be in default state");
-
-  yield startCustomizing();
-  gCustomizeMode.reset();
-  yield waitForCondition(function() !gCustomizeMode.resetting);
-  yield endCustomizing();
-
-  is(bookmarksToolbar.collapsed, true, "Customization reset should restore collapsed-state to the bookmarks toolbar");
-  isnot(tabsToolbar.getBoundingClientRect().height, 0, "TabsToolbar should have non-zero height");
-  is(bookmarksToolbar.getBoundingClientRect().height, 0, "The bookmarksToolbar should have height=0 after reset");
-  ok(CustomizableUI.inDefaultState, "Everything should be back to default state");
-});
-
-// Check that the menubar will be collapsed by resetting, if the platform supports it.
-add_task(function() {
-  let menubar = document.getElementById("toolbar-menubar");
-  const canMenubarCollapse = CustomizableUI.isToolbarDefaultCollapsed(menubar.id);
-  if (!canMenubarCollapse) {
-    return;
-  }
-  ok(CustomizableUI.inDefaultState, "Everything should be in its default state");
-
-  is(menubar.getBoundingClientRect().height, 0, "menubar should be hidden by default");
-  setToolbarVisibility(menubar, true);
-  isnot(menubar.getBoundingClientRect().height, 0, "menubar should be visible now");
-
-  yield startCustomizing();
-  gCustomizeMode.reset();
-  yield waitForCondition(function() !gCustomizeMode.resetting);
-
-  is(menubar.getAttribute("autohide"), "true", "The menubar should have autohide=true after reset in customization mode");
-  is(menubar.getBoundingClientRect().height, 0, "The menubar should have height=0 after reset in customization mode");
-
-  yield endCustomizing();
-
-  is(menubar.getAttribute("autohide"), "true", "The menubar should have autohide=true after reset");
-  is(menubar.getBoundingClientRect().height, 0, "The menubar should have height=0 after reset");
-});
-
-// Customization reset should restore collapsed-state to default-collapsed toolbars.
-add_task(function() {
-  ok(CustomizableUI.inDefaultState, "Everything should be in its default state");
-  is(bookmarksToolbar.getBoundingClientRect().height, 0, "bookmarksToolbar should have height=0");
-  isnot(tabsToolbar.getBoundingClientRect().height, 0, "TabsToolbar should have non-zero height");
-
-  setToolbarVisibility(bookmarksToolbar, true);
-  isnot(bookmarksToolbar.getBoundingClientRect().height, 0, "bookmarksToolbar should be visible now");
-  is(CustomizableUI.inDefaultState, false, "Should no longer be in default state");
-
-  yield startCustomizing();
-
-  isnot(bookmarksToolbar.getBoundingClientRect().height, 0, "The bookmarksToolbar should be visible before reset");
-  isnot(navbar.getBoundingClientRect().height, 0, "The navbar should be visible before reset");
-  isnot(tabsToolbar.getBoundingClientRect().height, 0, "TabsToolbar should have non-zero height");
-
-  gCustomizeMode.reset();
-  yield waitForCondition(function() !gCustomizeMode.resetting);
-
-  is(bookmarksToolbar.getBoundingClientRect().height, 0, "The bookmarksToolbar should have height=0 after reset");
-  isnot(tabsToolbar.getBoundingClientRect().height, 0, "TabsToolbar should have non-zero height");
-  isnot(navbar.getBoundingClientRect().height, 0, "The navbar should still be visible after reset");
-  ok(CustomizableUI.inDefaultState, "Everything should be back to default state");
-  yield endCustomizing();
-});
--- a/browser/components/customizableui/test/browser_940013_registerToolbarNode_calls_registerArea.js
+++ b/browser/components/customizableui/test/browser_940013_registerToolbarNode_calls_registerArea.js
@@ -5,53 +5,51 @@
 "use strict";
 
 const kToolbarId = "test-registerToolbarNode-toolbar";
 const kButtonId = "test-registerToolbarNode-button";
 registerCleanupFunction(cleanup);
 
 // Registering a toolbar with defaultset attribute should work
 add_task(function() {
-  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
   let btn = createDummyXULButton(kButtonId);
   let toolbar = document.createElement("toolbar");
   toolbar.id = kToolbarId;
   toolbar.setAttribute("customizable", true);
   toolbar.setAttribute("defaultset", kButtonId);
   gNavToolbox.appendChild(toolbar);
   ok(CustomizableUI.areas.indexOf(kToolbarId) != -1,
      "Toolbar should have been registered automatically.");
   is(CustomizableUI.getAreaType(kToolbarId), CustomizableUI.TYPE_TOOLBAR,
      "Area should be registered as toolbar");
   assertAreaPlacements(kToolbarId, [kButtonId]);
-  ok(!CustomizableUI.inDefaultState, "No longer in default state after toolbar is registered and visible.");
+  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
   CustomizableUI.unregisterArea(kToolbarId, true);
   toolbar.remove();
   ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
   btn.remove();
 });
 
 // Registering a toolbar without a defaultset attribute should
 // wait for the registerArea call
 add_task(function() {
-  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
   let btn = createDummyXULButton(kButtonId);
   let toolbar = document.createElement("toolbar");
   toolbar.id = kToolbarId;
   toolbar.setAttribute("customizable", true);
   gNavToolbox.appendChild(toolbar);
   ok(CustomizableUI.areas.indexOf(kToolbarId) == -1,
      "Toolbar should not yet have been registered automatically.");
   CustomizableUI.registerArea(kToolbarId, {defaultPlacements: [kButtonId]});
   ok(CustomizableUI.areas.indexOf(kToolbarId) != -1,
      "Toolbar should have been registered now.");
   is(CustomizableUI.getAreaType(kToolbarId), CustomizableUI.TYPE_TOOLBAR,
      "Area should be registered as toolbar");
   assertAreaPlacements(kToolbarId, [kButtonId]);
-  ok(!CustomizableUI.inDefaultState, "No longer in default state after toolbar is registered and visible.");
+  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
   CustomizableUI.unregisterArea(kToolbarId, true);
   toolbar.remove();
   ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
   btn.remove();
 });
 
 add_task(function asyncCleanup() {
   yield resetCustomization();
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -111,24 +111,20 @@
 .cui-widget-panel > .panel-arrowcontainer > .panel-arrowcontent > .popup-internal-box {
   padding: 0;
 }
 
 .panelUI-grid .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
   text-align: center;
   -moz-hyphens: auto;
+  mask: url(chrome://browser/content/browser.xul#menuPanelButtonTextFadeOutMask);
   min-height: 3.5em;
 }
 
-.panelUI-grid:not([customize-transitioning]) .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
-.panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-multiline-text {
-  mask: url(chrome://browser/content/browser.xul#menuPanelButtonTextFadeOutMask);
-}
-
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
   margin: 2px 0 0;
 }
 
 .panelUI-grid .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text {
   margin: -1px 0 0;
 }