From 3af8f2bf3561d5a2de229c11826a307e445c8fe6 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Mon, 21 May 2018 14:01:23 +0100
Subject: [PATCH] Bug 1458584 - Remove the scrollbox-base binding and instead
 import the scrollbox.css file in components.css. r=bgrins

MozReview-Commit-ID: 3n1kZN7vCIv

--HG--
extra : source : 13ae2716c71ea86cbc2574f6615a5d7b5c629a5f
extra : intermediate-source : cab63cfb8598dbf07f938ea5a9e6a9b8bed9f225
---
 toolkit/content/components.css        |  1 +
 toolkit/content/widgets/scrollbox.xml | 12 +++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/toolkit/content/components.css b/toolkit/content/components.css
index 2373f6953ba2..83d9b80edb8e 100644
--- a/toolkit/content/components.css
+++ b/toolkit/content/components.css
@@ -10,5 +10,6 @@
 @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");
diff --git a/toolkit/content/widgets/scrollbox.xml b/toolkit/content/widgets/scrollbox.xml
index 327b191b2551..c745676b6d6a 100644
--- a/toolkit/content/widgets/scrollbox.xml
+++ b/toolkit/content/widgets/scrollbox.xml
@@ -9,13 +9,7 @@
    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/>
@@ -32,7 +26,7 @@
     </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"
@@ -579,7 +573,7 @@
     </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>