Bug 1453958 - Remove menulist-base binding. r?dao draft
authorEdouard Oger <eoger@fastmail.com>
Fri, 13 Apr 2018 22:02:48 -0400
changeset 783090 54b67641c741
parent 782895 6276ec7ebbf3
push id106599
push userbmo:eoger@fastmail.com
push dateMon, 16 Apr 2018 14:47:26 +0000
reviewersdao
bugs1453958
milestone61.0a1
Bug 1453958 - Remove menulist-base binding. r?dao MozReview-Commit-ID: IZTg4njQtCb
toolkit/content/components.css
toolkit/content/jar.mn
toolkit/content/menulist.css
toolkit/content/moz.build
toolkit/content/widgets/menulist.xml
toolkit/content/xul.css
--- a/toolkit/content/components.css
+++ b/toolkit/content/components.css
@@ -3,10 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== components.css =================================================
   == Styles ported from XBL <resources>, loaded as UA styles in every XUL doc
   ======================================================================= */
 
 @import url("chrome://global/skin/groupbox.css");
 @import url("chrome://global/skin/menu.css");
+@import url("chrome://global/skin/menulist.css");
 @import url("chrome://global/skin/toolbar.css");
 @import url("chrome://global/skin/splitter.css");
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -1,16 +1,15 @@
 toolkit.jar:
 %  content global %content/global/ contentaccessible=yes
 *  content/global/license.html
    content/global/minimal-xul.css
 *  content/global/xul.css
    content/global/components.css
    content/global/textbox.css
-   content/global/menulist.css
    content/global/autocomplete.css
    content/global/aboutAbout.js
    content/global/aboutAbout.xhtml
 #ifdef MOZILLA_OFFICIAL
    content/global/aboutRights.xhtml
 #else
    content/global/aboutRights.xhtml           (aboutRights-unbranded.xhtml)
 #endif
deleted file mode 100644
--- a/toolkit/content/menulist.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* 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/. */
-
-@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
-
-html|*.menulist-editable-input {
-  -moz-appearance: none !important;
-  background: transparent ! important;
-  -moz-box-flex: 1;
-}
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -251,19 +251,16 @@ with Files('direction*'):
     BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
 
 with Files('edit*'):
     BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
 
 with Files('globalOverlay.*'):
     BUG_COMPONENT = ('Toolkit', 'General')
 
-with Files('menulist.css'):
-    BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
-
 with Files('minimal-xul.css'):
     BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
 
 with Files('plugins*'):
     BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
 
 with Files('resetProfile*'):
     BUG_COMPONENT = ('Firefox', 'Migration')
--- a/toolkit/content/widgets/menulist.xml
+++ b/toolkit/content/widgets/menulist.xml
@@ -5,25 +5,18 @@
 
 
 <bindings id="menulistBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="menulist-base" extends="chrome://global/content/bindings/general.xml#basecontrol">
-    <resources>
-      <stylesheet src="chrome://global/content/menulist.css"/>
-      <stylesheet src="chrome://global/skin/menulist.css"/>
-    </resources>
-  </binding>
-
   <binding id="menulist" display="xul:menu"
-           extends="chrome://global/content/bindings/menulist.xml#menulist-base">
+           extends="chrome://global/content/bindings/general.xml#basecontrol">
     <content sizetopopup="pref">
       <xul:hbox class="menulist-label-box" flex="1">
         <xul:image class="menulist-icon" xbl:inherits="src=image,src"/>
         <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey,highlightable" crop="right" flex="1"/>
         <xul:label class="menulist-highlightable-label" xbl:inherits="xbl:text=label,crop,accesskey,highlightable" crop="right" flex="1"/>
       </xul:hbox>
       <xul:dropmarker class="menulist-dropmarker" type="menu" xbl:inherits="disabled,open"/>
       <children includes="menupopup"/>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -818,16 +818,22 @@ menulist[popuponly="true"] {
 menulist[editable="true"] {
   -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-editable");
 }
 
 menulist > menupopup > menuitem {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
 }
 
+html|*.menulist-editable-input {
+  -moz-appearance: none !important;
+  background: transparent ! important;
+  -moz-box-flex: 1;
+}
+
 dropmarker {
   -moz-binding: url("chrome://global/content/bindings/general.xml#dropmarker");
 }
 
 /********** splitter **********/
 
 .tree-splitter {
   width: 0px;