Bug 1442795 - Remove scale-thumb and scale-slider bindings draft
authorTimothy Guan-tin Chien <timdream@gmail.com>
Fri, 02 Mar 2018 17:03:13 -0800
changeset 762841 a1b27ba0dd2ccd7a14b0ce878e3ced7da88bd50f
parent 762567 9caf14e0b300424d05fe5dd5afa7b9d1c65a5416
push id101266
push userbmo:timdream@gmail.com
push dateSat, 03 Mar 2018 01:05:13 +0000
bugs1442795
milestone60.0a1
Bug 1442795 - Remove scale-thumb and scale-slider bindings Both bindings contain no content to be styled, and their own styles are applied by <resources> import from the scale binding. This patch also moves the binding rules from minimal-xul.css to xul.css, given that while <scale> is used in <videocontrols>, HTML documents containing <video> or <audio> will load the full xul.css. MozReview-Commit-ID: JrmMqsWhnhd
toolkit/content/minimal-xul.css
toolkit/content/widgets/scale.xml
toolkit/content/xul.css
--- a/toolkit/content/minimal-xul.css
+++ b/toolkit/content/minimal-xul.css
@@ -85,45 +85,32 @@ resizer {
 scrollbar[orient="horizontal"] {
   direction: ltr;
 }
 
 thumb {
   display: -moz-box !important;
 }
 
-.scale-thumb {
-  -moz-binding: url(chrome://global/content/bindings/scale.xml#scalethumb);
-}
-
 scrollbar, scrollbarbutton, scrollcorner, slider, thumb, scale {
   -moz-user-select: none;
 }
 
 scrollcorner {
   display: -moz-box !important;
 }
 
 scrollcorner[hidden="true"] {
   display: none !important;
 }
 
 scrollbar[value="hidden"] {
   visibility: hidden;
 }
 
-scale {
-  -moz-binding: url(chrome://global/content/bindings/scale.xml#scale);
-}
-
-.scale-slider {
-  -moz-binding: url(chrome://global/content/bindings/scale.xml#scaleslider);
-  -moz-user-focus: normal;
-}
-
 @media (-moz-scrollbar-start-backward: 0) {
   scrollbarbutton[sbattr="scrollbar-up-top"] {
     display: none;
   }
 }
 
 @media (-moz-scrollbar-start-forward: 0) {
   scrollbarbutton[sbattr="scrollbar-down-top"] {
--- a/toolkit/content/widgets/scale.xml
+++ b/toolkit/content/widgets/scale.xml
@@ -4,29 +4,16 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <bindings id="scaleBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="scalethumb" extends="xul:button">
-    <resources>
-      <stylesheet src="chrome://global/skin/scale.css"/>
-    </resources>
-  </binding>
-
-  <binding id="scaleslider" display="xul:slider"
-           extends="chrome://global/content/bindings/general.xml#basecontrol">
-    <resources>
-      <stylesheet src="chrome://global/skin/scale.css"/>
-    </resources>
-  </binding>
-
   <binding id="scale"
            extends="chrome://global/content/bindings/general.xml#basecontrol">
     <resources>
       <stylesheet src="chrome://global/skin/scale.css"/>
     </resources>
 
     <content align="center" pack="center">
       <xul:slider anonid="slider" class="scale-slider" snap="true" flex="1"
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -865,16 +865,27 @@ grippy {
 .tree-splitter {
   width: 0px;
   max-width: 0px;
   min-width: 0% ! important;
   min-height: 0% ! important;
   -moz-box-ordinal-group: 2147483646;
 }
 
+/********** scale **************/
+
+scale {
+  -moz-binding: url(chrome://global/content/bindings/scale.xml#scale);
+}
+
+.scale-slider {
+  -moz-binding: url(chrome://global/content/bindings/general.xml#basecontrol);
+  -moz-user-focus: normal;
+}
+
 /******** scrollbar ********/
 
 slider {
   /* This is a hint to layerization that the scrollbar thumb can never leave
      the scrollbar track. */
   overflow: hidden;
 }