Bug 1204845 - Remove the menuitem-iconic-both binding. r=enndeakin

browser/base/content/tabbrowser.xml

@@ -6211,12 +6211,23 @@
           else
             aMenuitem.removeAttribute("selected");
 
+          function addEndImage() {
+            let endImage = document.createElement("image");
+            endImage.setAttribute("class", "alltabs-endimage");
+            let endImageContainer = document.createElement("hbox");
+            endImageContainer.setAttribute("align", "center");
+            endImageContainer.setAttribute("pack", "center");
+            endImageContainer.appendChild(endImage);
+            aMenuitem.appendChild(endImageContainer);
+            return endImage;
+          }
+
+          if (aMenuitem.firstChild)
+            aMenuitem.firstChild.remove();
           if (aTab.hasAttribute("muted"))
-            aMenuitem.setAttribute("endimage", "chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted");
+            addEndImage().setAttribute("muted", "true");
           else if (aTab.hasAttribute("soundplaying"))
-            aMenuitem.setAttribute("endimage", "chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio");
-          else
-            aMenuitem.removeAttribute("endimage");
+            addEndImage().setAttribute("soundplaying", "true");
         ]]></body>
       </method>
     </implementation>

browser/themes/linux/browser.css

@@ -331,7 +331,7 @@ menuitem.bookmark-item {
 }
 
 /* Stock icons for the menu bar items */
-menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) {
+menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
 }
 
@@ -1636,6 +1636,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   box-shadow: inset -5px 0 ThreeDShadow;
 }
 
+.alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted);
+}
+
+.alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
+}
+
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");

browser/themes/osx/browser.css

@@ -2958,6 +2958,14 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   box-shadow: inset -5px 0 ThreeDShadow;
 }
 
+.alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted);
+}
+
+.alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
+}
+
 /* Bookmarks toolbar */
 #PlacesToolbarDropIndicator {
   list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);

browser/themes/windows/browser.css

@@ -2245,6 +2245,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   box-shadow: inset -5px 0 ThreeDShadow;
 }
 
+.alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted);
+}
+
+.alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
+}
+
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }

toolkit/content/widgets/menu.xml

@@ -217,25 +217,13 @@
         <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/>
       </xul:hbox>
       <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/>
+      <children/>
       <xul:hbox class="menu-accel-container" anonid="accel">
         <xul:label class="menu-iconic-accel" xbl:inherits="value=acceltext"/>
       </xul:hbox>
     </content>
   </binding>
 
-  <binding id="menuitem-iconic-both" extends="chrome://global/content/bindings/menu.xml#menuitem">
-    <content>
-      <xul:hbox class="menu-iconic-left" align="center" pack="center"
-                xbl:inherits="selected,_moz-menuactive,disabled,checked">
-        <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/>
-      </xul:hbox>
-      <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/>
-      <xul:hbox class="menu-iconic-right" align="center" pack="center">
-        <xul:image class="menu-iconic-icon" xbl:inherits="src=endimage"/>
-      </xul:hbox>
-    </content>
-  </binding>
-
   <binding id="menuitem-iconic-noaccel" extends="chrome://global/content/bindings/menu.xml#menuitem">
     <content>
       <xul:hbox class="menu-iconic-left" align="center" pack="center"

toolkit/content/xul.css

@@ -388,10 +388,6 @@ menuitem.menuitem-non-iconic {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menubutton-item");
 }
 
-menuitem.menuitem-iconic[endimage] {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-both");
-}
-
 menucaption {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menucaption");
 }

toolkit/themes/osx/global/menu.css

@@ -77,12 +77,6 @@ menuitem[src] > .menu-iconic-left > .menu-iconic-icon {
   width: 16px;
 }
 
-menuitem[endimage] > .menu-iconic-right > .menu-iconic-icon {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 0;
-  width: 16px;
-}
-
 /* ..... menu arrow box ..... */
 
 .menu-right,

toolkit/themes/windows/global/menu.css

@@ -103,18 +103,11 @@ menucaption > .menu-iconic-text {
 
 menu.menu-iconic > .menu-iconic-left,
 menuitem.menuitem-iconic > .menu-iconic-left,
-.splitmenu-menuitem[iconic="true"] > .menu-iconic-left,
-menuitem[endimage] > .menu-iconic-right {
+.splitmenu-menuitem[iconic="true"] > .menu-iconic-left {
   -moz-appearance: menuimage;
   padding-top: 2px;
 }
 
-menuitem[endimage] > .menu-iconic-right > .menu-iconic-icon {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 5px;
-  width: 16px;
-}
-
 /* ..... menu arrow box ..... */
 
 .menu-right {