Bug 631649 - CSS error -moz-column-count since bug 595965 landed, a-2.0=dolske

browser/base/content/tabview/groupitems.js

@@ -236,7 +236,7 @@ function GroupItem(listOfEls, options) {
 
   AllTabs.tabs.forEach(function(xulTab) {
     if (xulTab.pinned && xulTab.ownerDocument.defaultView == gWindow)
-      self.addAppTab(xulTab);
+      self.addAppTab(xulTab, {dontAdjustTray: true});
   });
 
   // ___ Undo Close
@@ -393,7 +393,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     if (!icons.length) {
       // There are no icons, so hide the appTabTray if needed.
       if (parseInt(container.css("width")) != 0) {
-        this.$appTabTray.css("-moz-column-count", 0);
+        this.$appTabTray.css("-moz-column-count", "auto");
         this.$appTabTray.css("height", 0);
         container.css("width", 0);
         container.css("height", 0);
@@ -418,6 +418,9 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     let iconWidth = iconBounds.width + columnsGap;
     let maxColumns = Math.floor((boxBounds.width * 0.20) / iconWidth);
 
+    Utils.assert(rows > 0 && columns > 0 && maxColumns > 0,
+      "make sure the calculated rows, columns and maxColumns are correct");
+
     if (columns > maxColumns)
       container.addClass("appTabTrayContainerTruncated");
     else if (container.hasClass("appTabTrayContainerTruncated"))
@@ -1113,7 +1116,15 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
 
   // ----------
   // Adds the given xul:tab as an app tab in this group's apptab tray
-  addAppTab: function GroupItem_addAppTab(xulTab) {
+  //
+  // Parameters:
+  //   options - change how the app tab is added.
+  //
+  // Options:
+  //   dontAdjustTray - (boolean) if true, the $appTabTray size is not adjusted,
+  //                    which means that the adjustAppTabTray() method is not
+  //                    called.
+  addAppTab: function GroupItem_addAppTab(xulTab, options) {
     let self = this;
 
     xulTab.addEventListener("error", this._onAppTabError, false);
@@ -1133,8 +1144,9 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         UI.goToTab(iQ(this).data("xulTab"));
       });
 
-    // adjust the tray
-    this.adjustAppTabTray(true);
+    // adjust the tray, if needed.
+    if (!options || !options.dontAdjustTray)
+      this.adjustAppTabTray(true);
   },
 
   // ----------

browser/themes/gnomestripe/browser/tabview/tabview.css

@@ -264,7 +264,6 @@ html[dir=rtl] .appTabTrayContainer {
 .appTabTray {
   display: inline-block;
   -moz-column-width: 16px;
-  -moz-column-count: 0;
   -moz-column-gap: 5px;
 }
 

browser/themes/pinstripe/browser/tabview/tabview.css

@@ -258,7 +258,6 @@ html[dir=rtl] .appTabTrayContainer {
 .appTabTray {
   display: inline-block;
   -moz-column-width: 16px;
-  -moz-column-count: 0;
   -moz-column-gap: 5px;
 }
 

browser/themes/winstripe/browser/tabview/tabview.css

@@ -283,7 +283,6 @@ html[dir=rtl] .appTabTrayContainer {
 .appTabTray {
   display: inline-block;
   -moz-column-width: 16px;
-  -moz-column-count: 0;
   -moz-column-gap: 5px;
 }