Bug 1429464 - Remove toolbox binding r=Gijs draft
authorTimothy Guan-tin Chien <timdream@gmail.com>
Mon, 05 Feb 2018 16:28:49 +0800
changeset 751085 f0916c822a0056d426254a5e3436500bec7fa8ce
parent 751044 ef1fefe4c6d1f95e2bdf872094e02e85c962aa86
push id97844
push usertimdream@gmail.com
push dateMon, 05 Feb 2018 08:29:25 +0000
reviewersGijs
bugs1429464
milestone60.0a1
Bug 1429464 - Remove toolbox binding r=Gijs - Move -moz-appearance: toolbox to xul.css. - Remove the markup that initialize the palette field to null, effectively initialize the value to undefined, which is still falsey. MozReview-Commit-ID: 7X6JAn79P3k
toolkit/content/widgets/toolbar.xml
toolkit/content/xul.css
toolkit/themes/linux/global/toolbar.css
toolkit/themes/osx/global/toolbar.css
toolkit/themes/windows/global/toolbar.css
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -10,24 +10,16 @@
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="toolbar-base">
     <resources>
       <stylesheet src="chrome://global/skin/toolbar.css"/>
     </resources>
   </binding>
 
-  <binding id="toolbox" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
-    <implementation>
-      <field name="palette">
-        null
-      </field>
-    </implementation>
-  </binding>
-
   <binding id="toolbar" role="xul:toolbar"
            extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" />
 
   <binding id="toolbar-menubar-autohide"
            extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <implementation>
       <constructor>
         this._setInactive();
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -277,17 +277,17 @@ splitter,
 scale,
 menulist {
   -moz-window-dragging: no-drag;
 }
 
 /******* toolbar *******/
 
 toolbox {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbox");
+  -moz-appearance: toolbox;
   -moz-box-orient: vertical;
 }
 
 toolbar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
 }
 
 toolbar[customizing="true"][collapsed="true"] {
--- a/toolkit/themes/linux/global/toolbar.css
+++ b/toolkit/themes/linux/global/toolbar.css
@@ -3,22 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== toolbar.css ====================================================
   == Styles used by XUL toolbar-related elements.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: toolbox ::::: */
-
-toolbox {
-  -moz-appearance: toolbox;
-}
-
 /* ::::: menubar & toolbar ::::: */
 
 toolbar {
   -moz-appearance: toolbar;
   min-width: 1px;
   min-height: 20px;
   padding: 2px 0px;
 }
--- a/toolkit/themes/osx/global/toolbar.css
+++ b/toolkit/themes/osx/global/toolbar.css
@@ -1,20 +1,14 @@
 /* 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 url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-toolbox {
-  /* Setting -moz-appearance:toolbox causes sheets to attach under the
-   * toolbox and has no other effects. It doesn't render anything. */
-  -moz-appearance: toolbox;
-}
-
 toolbar {
   min-width: 1px;
   min-height: 20px;
   -moz-appearance: toolbar;
 }
 
 menubar:-moz-lwtheme,
 toolbar:-moz-lwtheme {
--- a/toolkit/themes/windows/global/toolbar.css
+++ b/toolkit/themes/windows/global/toolbar.css
@@ -3,39 +3,33 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== toolbar.css ====================================================
   == Styles used by XUL toolbar-related elements.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: toolbox ::::: */
-
-toolbox {
-  -moz-appearance: toolbox;
-}
-
 /* ::::: toolbar & menubar ::::: */
 
 toolbar, menubar {
   -moz-appearance: toolbar;
 }
 
 toolbar {
   min-width: 1px;
   min-height: 19px;
 }
 
 toolbar:first-child, menubar {
   min-width: 1px;
 }
 
 /* ::::: lightweight theme ::::: */
- 
+
 menubar:-moz-lwtheme,
 toolbox:-moz-lwtheme,
 toolbar:-moz-lwtheme {
   -moz-appearance: none;
 }
 
 /* ::::: toolbar decorations ::::: */