Bug 1519577 Remove test_bug562554.xul dependence on button.xml r=bzbarsky
authorAndrew Swan <aswan@mozilla.com>
Tue, 14 May 2019 16:33:38 -0700
changeset 474974 8de5e0880f85d8986b2995cd8685245922e41b5f
parent 474973 57bf01d965797fac39ca0f267050633039aa4c57
child 474975 8f0abb76f7bb982c13424019f7bda30089acf1e8
push id113185
push useraswan@mozilla.com
push dateWed, 22 May 2019 23:25:35 +0000
treeherdermozilla-inbound@c8e9b6a81194 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs1519577, 562554, 653881, 888787
milestone69.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 1519577 Remove test_bug562554.xul dependence on button.xml r=bzbarsky This is essentially reverting the test changes from bug 653881. The platform changes that motivated bug 653881 were reverted in bug 888787 but the test changes were left in place at that time. Differential Revision: https://phabricator.services.mozilla.com/D31937
toolkit/content/tests/chrome/test_bug562554.xul
--- a/toolkit/content/tests/chrome/test_bug562554.xul
+++ b/toolkit/content/tests/chrome/test_bug562554.xul
@@ -4,32 +4,24 @@
   XUL Widget Test for bug 562554
   -->
 <window title="Bug 562554" width="400" height="400"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
 
-<xbl:bindings xmlns:xbl="http://www.mozilla.org/xbl">
-  <xbl:binding id="menu" extends="chrome://global/content/bindings/button.xml#button-base">
-    <xbl:content>
-      <xbl:children includes="menupopup"/>
-      <xul:stack>
-         <xul:button width="100" left="0" top="0" height="30" allowevents="true"
-                     onclick="eventReceived('clickbutton1'); return false;"/>
-         <xul:button width="100" left="70" top="0" height="30" 
-                     onclick="eventReceived('clickbutton2'); return false;"/>
-      </xul:stack>
-    </xbl:content>
-  </xbl:binding>
-</xbl:bindings>
-
-  <toolbarbutton type="menu" id="toolbarmenu" height="200" style="-moz-binding: url(#menu);">
+  <toolbarbutton type="menu" id="toolbarmenu" height="200">
     <menupopup id="menupopup" onpopupshowing="eventReceived('popupshowing'); return false;"/>
+    <stack>
+      <button width="100" left="0" top="0" height="30" allowevents="true"
+              onclick="eventReceived('clickbutton1'); return false;"/>
+      <button width="100" left="70" top="0" height="30"
+              onclick="eventReceived('clickbutton2'); return false;"/>
+    </stack>
   </toolbarbutton>
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
 <script type="application/javascript">
 <![CDATA[