Bug 1429464 - Remove toolbox binding r=Gijs
authorTimothy Guan-tin Chien <timdream@gmail.com>
Mon, 05 Feb 2018 16:28:49 +0800
changeset 402568 df6d2c3ee671e81f1a8b4f6d13197eee52db9680
parent 402567 eb72b3330274b2a5fdb36048d1b5c3c79f5aee7d
child 402569 1f89e76b2f3d31cea096b0c9e52000843b8a13d7
push id59162
push usertimdream@gmail.com
push dateTue, 06 Feb 2018 15:07:01 +0000
treeherderautoland@df6d2c3ee671 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1429464
milestone60.0a1
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
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. The toolbar binding remains responsible for initializing the toolbox's palette property with an actual DOM node. 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 ::::: */