Backed out changeset fcb76f118295 (bug 1494846) for Mn failures in browser\components\migration\tests\marionette\test_refresh_firefox.py TestFirefoxRefresh.testReset
authorshindli <shindli@mozilla.com>
Thu, 04 Oct 2018 09:07:05 +0300
changeset 495335 8dfe8c9a70d8e29d4b7abac83f0ae3c975d679e8
parent 495334 494eb5db564805bb0744ab20214b213c97849f1f
child 495336 4c3191c16f0a69be922e6b5c66386fc2ad9e0fb1
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1494846
milestone64.0a1
backs outfcb76f118295b385090bd5fe93a06cd9745601a8
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 changeset fcb76f118295 (bug 1494846) for Mn failures in browser\components\migration\tests\marionette\test_refresh_firefox.py TestFirefoxRefresh.testReset
toolkit/content/widgets/wizard.xml
toolkit/content/xul.css
toolkit/mozapps/update/content/updates.xml
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -171,40 +171,16 @@
                            .createBundle("chrome://global/locale/wizard.properties");
         } catch (e) {
           // This fails in remote XUL, which has to provide titles for all pages
           // see bug 142502
         }
 
         // get anonymous content references
         this._wizardHeader = document.getAnonymousElementByAttribute(this, "anonid", "Header");
-
-        this._wizardHeader.appendChild(
-          MozXULElement.parseXULToFragment(/Mac/.test(navigator.platform) ?
-            `<stack class="wizard-header-stack" flex="1">
-              <vbox class="wizard-header-box-1">
-                <vbox class="wizard-header-box-text">
-                  <label class="wizard-header-label"/>
-                </vbox>
-              </vbox>
-              <hbox class="wizard-header-box-icon">
-                <spacer flex="1"/>
-                <image class="wizard-header-icon"/>
-              </hbox>
-            </stack>` :
-            `<hbox class="wizard-header-box-1" flex="1">
-              <vbox class="wizard-header-box-text" flex="1">
-                <label class="wizard-header-label"/>
-                <label class="wizard-header-description"/>
-              </vbox>
-              <image class="wizard-header-icon"/>
-            </hbox>`
-          )
-        );
-
         this._wizardButtons = document.getAnonymousElementByAttribute(this, "anonid", "Buttons");
         this._deck = document.getAnonymousElementByAttribute(this, "anonid", "Deck");
 
         this._initWizardButton("back");
         this._initWizardButton("next");
         this._initWizardButton("finish");
         this._initWizardButton("cancel");
         this._initWizardButton("extra1");
@@ -409,24 +385,18 @@
             }
           } else if (!label && this.onLastPage && this._bundle) {
             if (/Mac/.test(navigator.platform)) {
               label = this._bundle.GetStringFromName("default-last-title-mac");
             } else {
               label = this._bundle.formatStringFromName("default-last-title", [this.title], 1);
             }
           }
-          this._wizardHeader.
-            querySelector(".wizard-header-label").textContent = label;
-          let headerDescEl =
-            this._wizardHeader.querySelector(".wizard-header-description");
-          if (headerDescEl) {
-            headerDescEl.textContent =
-              this.currentPage.getAttribute("description");
-          }
+          this._wizardHeader.setAttribute("label", label);
+          this._wizardHeader.setAttribute("description", this.currentPage.getAttribute("description"));
         ]]></body>
       </method>
 
       <method name="_hitEnter">
         <parameter name="evt"/>
         <body>
         <![CDATA[
           if (!evt.defaultPrevented)
@@ -482,16 +452,31 @@
       <property name="next"   onget="return this.getAttribute('next');"
                               onset="this.setAttribute('next', val);
                                      this.parentNode._accessMethod = 'random';
                                      return val;"/>
     </implementation>
   </binding>
 
 #ifdef XP_MACOSX
+  <binding id="wizard-header">
+    <content>
+      <xul:stack class="wizard-header-stack" flex="1">
+        <xul:vbox class="wizard-header-box-1">
+          <xul:vbox class="wizard-header-box-text">
+            <xul:label class="wizard-header-label" xbl:inherits="xbl:text=label"/>
+          </xul:vbox>
+        </xul:vbox>
+        <xul:hbox class="wizard-header-box-icon">
+          <xul:spacer flex="1"/>
+          <xul:image class="wizard-header-icon" xbl:inherits="src=iconsrc"/>
+        </xul:hbox>
+      </xul:stack>
+    </content>
+  </binding>
 
   <binding id="wizard-buttons">
     <content>
       <xul:vbox flex="1">
         <xul:hbox class="wizard-buttons-btm">
           <xul:button class="wizard-button" dlgtype="extra1" hidden="true"/>
           <xul:button class="wizard-button" dlgtype="extra2" hidden="true"/>
           <xul:button label="&button-cancel-mac.label;" class="wizard-button" dlgtype="cancel"/>
@@ -514,16 +499,28 @@
         ]]></body>
       </method>
     </implementation>
 
   </binding>
 
 #else
 
+  <binding id="wizard-header">
+    <content>
+      <xul:hbox class="wizard-header-box-1" flex="1">
+        <xul:vbox class="wizard-header-box-text" flex="1">
+          <xul:label class="wizard-header-label" xbl:inherits="xbl:text=label"/>
+          <xul:label class="wizard-header-description" xbl:inherits="xbl:text=description"/>
+        </xul:vbox>
+        <xul:image class="wizard-header-icon" xbl:inherits="src=iconsrc"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
   <binding id="wizard-buttons">
     <content>
       <xul:vbox class="wizard-buttons-box-1" flex="1">
         <xul:separator class="wizard-buttons-separator groove"/>
         <xul:hbox class="wizard-buttons-box-2">
           <xul:button class="wizard-button" dlgtype="extra1" hidden="true"/>
           <xul:button class="wizard-button" dlgtype="extra2" hidden="true"/>
           <xul:spacer flex="1" anonid="spacer"/>
@@ -535,31 +532,31 @@
                       class="wizard-button" dlgtype="back"/>
           <xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
             <xul:hbox>
               <xul:button label="&button-finish-unix.label;" class="wizard-button"
                           dlgtype="finish" default="true" flex="1"/>
             </xul:hbox>
             <xul:hbox>
               <xul:button label="&button-next-unix.label;" accesskey="&button-next-unix.accesskey;"
-                          class="wizard-button" dlgtype="next"
+                          class="wizard-button" dlgtype="next" 
                           default="true" flex="1"/>
             </xul:hbox>
           </xul:deck>
 #else
           <xul:button label="&button-back-win.label;" accesskey="&button-back-win.accesskey;"
                       class="wizard-button" dlgtype="back"/>
           <xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
             <xul:hbox>
               <xul:button label="&button-finish-win.label;" class="wizard-button"
                           dlgtype="finish" default="true" flex="1"/>
             </xul:hbox>
             <xul:hbox>
               <xul:button label="&button-next-win.label;" accesskey="&button-next-win.accesskey;"
-                          class="wizard-button" dlgtype="next"
+                          class="wizard-button" dlgtype="next" 
                           default="true" flex="1"/>
             </xul:hbox>
           </xul:deck>
           <xul:button label="&button-cancel-win.label;" class="wizard-button"
                       dlgtype="cancel"/>
 #endif
         </xul:hbox>
       </xul:vbox>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -774,16 +774,20 @@ wizard:root /* override :root from above
 }
 
 wizardpage {
   -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizardpage");
   -moz-box-orient: vertical;
   overflow: auto;
 }
 
+.wizard-header {
+  -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizard-header");
+}
+
 .wizard-buttons {
   -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizard-buttons");
 }
 
 /********** Rich Listbox ********/
 
 richlistbox {
   -moz-binding: url('chrome://global/content/bindings/richlistbox.xml#richlistbox');
--- a/toolkit/mozapps/update/content/updates.xml
+++ b/toolkit/mozapps/update/content/updates.xml
@@ -6,17 +6,17 @@
 
 <!DOCTYPE bindings SYSTEM "chrome://mozapps/locale/update/updates.dtd">
 
 <bindings id="updatesBindings"
           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="updateheader">
+  <binding id="updateheader" extends="chrome://global/content/bindings/wizard.xml#wizard-header">
     <content>
       <xul:hbox class="wizard-header update-header" flex="1">
         <xul:vbox class="wizard-header-box-1">
           <xul:vbox class="wizard-header-box-text">
             <xul:label class="wizard-header-label" xbl:inherits="value=label"/>
           </xul:vbox>
         </xul:vbox>
       </xul:hbox>