Backed out 2 changesets (bug 1461793, bug 1458584) for mochitest chrome failures on toolkit/content/tests/chrome/test_arrowpanel.xul. CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Tue, 22 May 2018 09:03:32 +0300
changeset 419267 116bf80e887145e918be4de6c6a11bad885c7d96
parent 419266 a910482f4598931944910a357431b22f823578fb
child 419268 f85be0c4f0562ea59a91000883e0e7848491837c
child 419330 b3ea1431f81df6789b3d2afa1e1428a6d5d65c3f
push id34032
push usernbeleuzu@mozilla.com
push dateTue, 22 May 2018 09:50:22 +0000
treeherdermozilla-central@f85be0c4f056 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1461793, 1458584
milestone62.0a1
backs out4d511f7fc5b5c16fdfea91242dea6086cd57c8c3
13ae2716c71ea86cbc2574f6615a5d7b5c629a5f
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
Backed out 2 changesets (bug 1461793, bug 1458584) for mochitest chrome failures on toolkit/content/tests/chrome/test_arrowpanel.xul. CLOSED TREE Backed out changeset 4d511f7fc5b5 (bug 1461793) Backed out changeset 13ae2716c71e (bug 1458584)
toolkit/content/components.css
toolkit/content/widgets/popup.xml
toolkit/content/widgets/scrollbox.xml
--- a/toolkit/content/components.css
+++ b/toolkit/content/components.css
@@ -5,12 +5,10 @@
 /* ===== 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/popup.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/popup.xml
+++ b/toolkit/content/widgets/popup.xml
@@ -6,17 +6,25 @@
 <!-- This files relies on these specific Chrome/XBL globals -->
 <!-- globals PopupBoxObject -->
 
 <bindings id="popupBindings"
    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="popup">
+  <binding id="popup-base">
+    <resources>
+      <stylesheet src="chrome://global/skin/popup.css"/>
+    </resources>
+  </binding>
+
+  <binding id="popup"
+           extends="chrome://global/content/bindings/popup.xml#popup-base">
+
     <content>
       <xul:arrowscrollbox class="popup-internal-box" flex="1" orient="vertical"
                           smoothscroll="false">
         <children/>
       </xul:arrowscrollbox>
     </content>
 
     <implementation>
@@ -42,17 +50,18 @@
           }
           for (var i = 0; i < array.length; i++)
             array[i].width = width;
         ]]>
       </handler>
     </handlers>
   </binding>
 
-  <binding id="panel">
+  <binding id="panel"
+           extends="chrome://global/content/bindings/popup.xml#popup-base">
     <implementation>
       <field name="_prevFocus">0</field>
     </implementation>
 
     <handlers>
       <handler event="popupshowing"><![CDATA[
         // Capture the previous focus before has a chance to get set inside the panel
         try {
@@ -253,17 +262,18 @@
         }
       </handler>
       <handler event="popuppositioned" phase="target">
         this.adjustArrowPosition();
       </handler>
     </handlers>
   </binding>
 
-  <binding id="tooltip">
+  <binding id="tooltip"
+           extends="chrome://global/content/bindings/popup.xml#popup-base">
     <content>
       <children>
         <xul:label class="tooltip-label" xbl:inherits="xbl:text=label" flex="1"/>
       </children>
     </content>
 
     <implementation>
       <field name="_mouseOutCount">0</field>
--- a/toolkit/content/widgets/scrollbox.xml
+++ b/toolkit/content/widgets/scrollbox.xml
@@ -4,34 +4,40 @@
    - 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" extends="chrome://global/content/bindings/general.xml#basecontrol">
+  <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">
     <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/general.xml#basecontrol">
+  <binding id="arrowscrollbox" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
     <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"
@@ -568,17 +574,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/general.xml#basecontrol">
+  <binding id="autorepeatbutton" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
     <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"