Bug 1458584 - Remove the scrollbox-base binding and instead import the scrollbox.css file in components.css. r=bgrins
MozReview-Commit-ID: 3n1kZN7vCIv
--- a/toolkit/content/components.css
+++ b/toolkit/content/components.css
@@ -5,10 +5,11 @@
/* ===== components.css =================================================
== Styles ported from XBL <resources>, loaded as UA styles in every XUL doc
======================================================================= */
@import url("chrome://global/skin/dropmarker.css");
@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/scrollbox.css");
@import url("chrome://global/skin/toolbar.css");
@import url("chrome://global/skin/splitter.css");--- a/toolkit/content/widgets/scrollbox.xml
+++ b/toolkit/content/widgets/scrollbox.xml
@@ -4,40 +4,34 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<bindings id="arrowscrollboxBindings"
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="scrollbox-base" extends="chrome://global/content/bindings/general.xml#basecontrol">
- <resources>
- <stylesheet src="chrome://global/skin/scrollbox.css"/>
- </resources>
- </binding>
-
- <binding id="scrollbox" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
+ <binding id="scrollbox" extends="chrome://global/content/bindings/general.xml#basecontrol">
<content>
<xul:box class="box-inherit scrollbox-innerbox" xbl:inherits="orient,align,pack,dir" flex="1">
<children/>
</xul:box>
</content>
<implementation>
<method name="scrollByIndex">
<parameter name="index"/>
<body>
this.boxObject.scrollByIndex(index);
</body>
</method>
</implementation>
</binding>
- <binding id="arrowscrollbox" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
+ <binding id="arrowscrollbox" extends="chrome://global/content/bindings/general.xml#basecontrol">
<content>
<xul:autorepeatbutton class="autorepeatbutton-up"
anonid="scrollbutton-up"
xbl:inherits="orient,collapsed=notoverflowing,disabled=scrolledtostart"
oncommand="_autorepeatbuttonScroll(event);"/>
<xul:spacer class="arrowscrollbox-overflow-start-indicator"
xbl:inherits="collapsed=scrolledtostart"/>
<xul:scrollbox class="arrowscrollbox-scrollbox"
@@ -574,17 +568,17 @@
<handler event="scrollend"><![CDATA[
this._isScrolling = false;
this._destination = 0;
this._direction = 0;
]]></handler>
</handlers>
</binding>
- <binding id="autorepeatbutton" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
+ <binding id="autorepeatbutton" extends="chrome://global/content/bindings/general.xml#basecontrol">
<content repeat="hover">
<xul:image class="autorepeatbutton-icon"/>
</content>
</binding>
<binding id="arrowscrollbox-clicktoscroll" extends="chrome://global/content/bindings/scrollbox.xml#arrowscrollbox">
<content>
<xul:toolbarbutton class="scrollbutton-up"