Backed out changeset 326f890f61a5 (bug 647540) for mass test bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 18 Dec 2014 15:49:07 -0500
changeset 246209 a081d845627d3dbb053b6b46aa18ecc287ef18ad
parent 246208 16f2c2fe21d5567872c318c3ea23a7ce507258c7
child 246210 e4c72ee3f315780df3829871ee039cfacf707373
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs647540
milestone37.0a1
backs out326f890f61a5b6165b716f86981df14652193b9d
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 326f890f61a5 (bug 647540) for mass test bustage. CLOSED TREE
addon-sdk/source/lib/sdk/ui/toolbar/view.js
browser/base/content/browser.css
browser/base/content/browser.xul
toolkit/components/printing/content/printUtils.js
toolkit/themes/osx/global/toolbar.css
--- a/addon-sdk/source/lib/sdk/ui/toolbar/view.js
+++ b/addon-sdk/source/lib/sdk/ui/toolbar/view.js
@@ -91,17 +91,17 @@ const addView = curry((options, {documen
   view.setAttribute("collapsed", options.collapsed);
   view.setAttribute("toolbarname", options.title);
   view.setAttribute("pack", "end");
   view.setAttribute("customizable", "false");
   view.setAttribute("style", "padding: 2px 0; max-height: 40px;");
   view.setAttribute("mode", "icons");
   view.setAttribute("iconsize", "small");
   view.setAttribute("context", "toolbar-context-menu");
-  view.setAttribute("class", "chromeclass-toolbar");
+  view.setAttribute("class", "toolbar-primary chromeclass-toolbar");
 
   let label = document.createElementNS(XUL_NS, "label");
   label.setAttribute("value", options.title);
   label.setAttribute("collapsed", "true");
   view.appendChild(label);
 
   let closeButton = document.createElementNS(XUL_NS, "toolbarbutton");
   closeButton.setAttribute("id", "close-" + options.id);
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -566,17 +566,17 @@ menuitem.spell-suggestion {
 
 /* apply Fitts' law to the notification bar's close button */
 window[sizemode="maximized"] #content .notification-inner {
   border-right: 0px !important;
 }
 
 /* Hide extension toolbars that neglected to set the proper class */
 window[chromehidden~="location"][chromehidden~="toolbar"] toolbar:not(.chromeclass-menubar),
-window[chromehidden~="toolbar"] toolbar:not(#nav-bar):not(#TabsToolbar):not(#print-preview-toolbar):not(.chromeclass-menubar) {
+window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-menubar) {
   display: none;
 }
 
 #navigator-toolbox ,
 #mainPopupSet {
   min-width: 1px;
 }
 
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -629,16 +629,17 @@
       <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
             id="titlebar-placeholder-on-menubar-for-caption-buttons" persist="width"
             skipintoolbarset="true"/>
 #endif
 #endif
     </toolbar>
 
     <toolbar id="TabsToolbar"
+             class="toolbar-primary"
              fullscreentoolbar="true"
              customizable="true"
              mode="icons"
              iconsize="small"
              aria-label="&tabsToolbar.label;"
              context="toolbar-context-menu"
              defaultset="tabbrowser-tabs,new-tab-button,alltabs-button"
              collapsed="true">
@@ -714,17 +715,17 @@
     </toolbar>
 
     <!--
            CAVEAT EMPTOR
            Should you need to add items to the toolbar here, make sure to also add them
            to the default placements of buttons in CustomizableUI.jsm, so the
            customization code doesn't get confused.
       -->
-    <toolbar id="nav-bar"
+    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="small"
 #ifdef MOZ_DEV_EDITION
              defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button"
 #else
              defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button"
 #endif
--- a/toolkit/components/printing/content/printUtils.js
+++ b/toolkit/components/printing/content/printUtils.js
@@ -469,16 +469,17 @@ var PrintUtils = {
 
       // show the toolbar after we go into print preview mode so
       // that we can initialize the toolbar with total num pages
       const XUL_NS =
         "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
       printPreviewTB = document.createElementNS(XUL_NS, "toolbar");
       printPreviewTB.setAttribute("printpreview", true);
       printPreviewTB.id = "print-preview-toolbar";
+      printPreviewTB.className = "toolbar-primary";
 
       let navToolbox = this._listener.getNavToolbox();
       navToolbox.parentNode.insertBefore(printPreviewTB, navToolbox);
       printPreviewTB.initialize(ppBrowser);
 
       // copy the window close handler
       if (document.documentElement.hasAttribute("onclose"))
         this._closeHandlerPP = document.documentElement.getAttribute("onclose");
--- a/toolkit/themes/osx/global/toolbar.css
+++ b/toolkit/themes/osx/global/toolbar.css
@@ -17,16 +17,20 @@ toolbar:-moz-lwtheme {
   border-color: transparent;
 }
 
 menubar {
   -moz-appearance: dialog; /* For content menubars, "toolbar" is too dark, so we use "dialog". */
   min-width: 1px;
 }
 
+.toolbar-primary {
+  min-height: 24px;
+}
+
 toolbarseparator {
   -moz-appearance: none;
   margin: 3px 4px;
   background: url("chrome://global/skin/toolbar/toolbar-separator.png") transparent repeat-y;
   padding: 0;
   width: 1px !important;
 }