[Australis] Backed out changeset 3d0775f7bd0f (bug 897496) for the same error it caused last time.
authorWes Kocher <wkocher@mozilla.com>
Thu, 30 Jan 2014 19:09:08 -0800
changeset 182238 f33d37e23b14a77bf9e42047d98d047042c5f958
parent 182237 00cead8f21d4cafd2daa37e84c57f828d2d54f7d
child 182239 d143c2077c0c438da27801f688f8d4ca6e20d50d
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs897496
milestone29.0a1
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
[Australis] Backed out changeset 3d0775f7bd0f (bug 897496) for the same error it caused last time.
browser/components/customizableui/src/CustomizeMode.jsm
browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -1046,29 +1046,26 @@ CustomizeMode.prototype = {
 
     // Hack needed so that the dragimage will still show the
     // item as it appeared before it was hidden.
     this._initializeDragAfterMove = function() {
       // For automated tests, we sometimes start exiting customization mode
       // before this fires, which leaves us with placeholders inserted after
       // we've exited. So we need to check that we are indeed customizing.
       if (this._customizing && !this._transitioning) {
-        item.removeAttribute("dragstarting");
         item.hidden = true;
         this._showPanelCustomizationPlaceholders();
         DragPositionManager.start(this.window);
         if (!isInToolbar && item.nextSibling) {
           this._setDragActive(item.nextSibling, "before", draggedItem.id, false);
         }
       }
       this._initializeDragAfterMove = null;
       this.window.clearTimeout(this._dragInitializeTimeout);
     }.bind(this);
-    item.setAttribute("dragstarting", true);
-    item.clientTop; // Force a layout flush to remove the overflow gradient.
     this._dragInitializeTimeout = this.window.setTimeout(this._initializeDragAfterMove, 0);
   },
 
   _onDragOver: function(aEvent) {
     if (this._isUnwantedDragDrop(aEvent)) {
       return;
     }
     if (this._initializeDragAfterMove) {
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -147,103 +147,41 @@ panelview:not([mainview]) .toolbarbutton
 #zoom-controls@inAnyPanel@ > toolbarbutton > .toolbarbutton-icon {
   min-width: 0;
   min-height: 0;
   margin: 0;
 }
 
 toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item),
 .panelUI-grid .toolbarbutton-1,
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 .customization-palette .toolbarbutton-1,
 .panel-customization-placeholder-child {
   -moz-appearance: none;
   -moz-box-orient: vertical;
-  width: calc(@menuPanelWidth@ / 3);
-  height: calc(40px + 4em);
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item),
-.panelUI-grid .toolbarbutton-1:not([type="menu-button"]),
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.customization-palette .toolbarbutton-1,
-.panel-customization-placeholder-child {
-  overflow: hidden;
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item)::after,
-.panelUI-grid .toolbarbutton-1:not([type="menu-button"])::after,
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button::after,
-.panelUI-grid #personal-bookmarks > toolbarbutton::after {
-  content: "";
-  position: absolute;
-  height: 1.5em;
-  margin-top: calc(-40px - 4em);
-  margin-bottom: -0.5em;
-%ifdef XP_MACOSX
-  background-image: linear-gradient(rgba(242,242,242,0), rgb(242,242,242) 75%);
-%elif XP_WIN
-  background-image: linear-gradient(rgba(255,255,255,0), rgb(255,255,255) 75%);
-%else
-  background-image: linear-gradient(rgba(242,241,240,0), rgb(242,241,240) 75%);
-%endif
-}
-
-toolbarpaletteitem[place="panel"][dragstarting] > toolbarbutton:not([type="menu-button"])::after,
-toolbarpaletteitem[place="panel"][dragstarting] > toolbaritem > toolbarbutton::after,
-toolbarpaletteitem[place="panel"][dragstarting] > toolbarbutton > toolbarbutton::after {
-  content: none !important;
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item)@buttonStateHover@::after,
-.panelUI-grid .toolbarbutton-1:not([type="menu-button"])@buttonStateHover@::after,
-.panelUI-grid .toolbarbutton-1@buttonStateHover@ > .toolbarbutton-menubutton-button::after,
-.panelUI-grid #personal-bookmarks > toolbarbutton@buttonStateHover@::after {
-%ifdef XP_MACOSX
-  background-image: linear-gradient(rgba(220,220,220,0), rgb(220,220,220) 75%);
-%elif XP_WIN
-  background-image: linear-gradient(rgba(236,236,237,0), rgb(236,236,237) 75%);
-%else
-  background-image: linear-gradient(rgba(224,223,223,0), rgb(224,223,223) 75%);
-%endif
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item)@buttonStateActive@::after,
-.panelUI-grid .toolbarbutton-1:not([type="menu-button"])@buttonStateActive@::after,
-.panelUI-grid .toolbarbutton-1@buttonStateActive@ > .toolbarbutton-menubutton-button::after,
-.panelUI-grid #personal-bookmarks > toolbarbutton@buttonStateActive@::after {
-%ifdef XP_MACOSX
-  background-image: linear-gradient(rgba(202,202,202,0), rgb(202,202,202) 75%);
-%elif XP_WIN
-  background-image: linear-gradient(rgba(220,220,220,0), rgb(220,220,220) 75%);
-%else
-  background-image: linear-gradient(rgba(209,208,207,0), rgb(209,208,207) 75%);
-%endif
+  min-width: calc(@menuPanelWidth@ / 3);
+  max-width: calc(@menuPanelWidth@ / 3);
+  height: calc(40px + 2.4em);
+  max-height: calc(40px + 2.4em);
 }
 
 .panel-customization-placeholder-child {
   margin: 6px 0 0;
   padding: 2px 6px;
   border: 1px solid transparent;
 }
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-box-align: center;
   width: 16px;
   -moz-margin-start: -16px;
   height: 40px;
-  margin-bottom: 4em;
+  max-height: 40px;
   padding: 0;
 }
 
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  margin-top: 3px; /* Hack needed to get type=menu-button to properly align vertically. */
-  border: 0;
-}
-
 .panelUI-grid .toolbarbutton-1:not([buttonover])@buttonStateHover@ > .toolbarbutton-menubutton-dropmarker {
   background-color: hsla(210,4%,10%,.1) !important;
   border-radius: 0 0 0 2px;
 }
 
 .panelUI-grid .toolbarbutton-1:not([buttonover])@buttonStateHover@ > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) {
   border-radius: 0 0 2px 0;
 }
@@ -274,17 +212,17 @@ toolbaritem[cui-areatype="menu-panel"][s
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon,
 .customization-palette .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .customization-palette .toolbarbutton-1 > .toolbarbutton-icon,
 .panelUI-grid #bookmarks-toolbar-placeholder > .toolbarbutton-icon,
 .customization-palette #bookmarks-toolbar-placeholder > .toolbarbutton-icon,
 .panel-customization-placeholder-child > .toolbarbutton-icon {
   min-width: 32px;
   min-height: 32px;
-  margin: 4px calc(@menuPanelWidth@ / 6 - 23px);
+  margin: 4px;
 }
 
 toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   -moz-box-flex: 1;
 }
 
 #edit-controls@inAnyPanel@ > #copy-button,
 #zoom-controls@inAnyPanel@ > #zoom-reset-button {
@@ -506,16 +444,20 @@ panelview .toolbarbutton-1,
   -moz-margin-end: -4px;
 }
 
 panelview .toolbarbutton-1,
 .widget-overflow-list .toolbarbutton-1 {
   margin-top: 6px;
 }
 
+.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  border: 0;
+}
+
 panelview .toolbarbutton-1@buttonStateHover@,
 .subviewbutton@buttonStateHover@,
 .widget-overflow-list .toolbarbutton-1@buttonStateHover@,
 #edit-controls@inAnyPanel@ > toolbarbutton@buttonStateHover@,
 #zoom-controls@inAnyPanel@ > toolbarbutton@buttonStateHover@ {
   background-color: hsla(210,4%,10%,.08);
   border-color: hsla(210,4%,10%,.1);
 }