Backed out changeset e0a7ac3aee3d (bug 848939) for mochitest-1 failures on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 13 Mar 2013 15:02:35 -0400
changeset 124727 e3a247547c357dde5453887cddd943762e3c0305
parent 124726 0531bbbb0ee13a0af433061cf2a0c2b22b3c8be1
child 124728 2a450024df4e2d116418bcc3ec49e324e66a270a
push id24433
push useremorley@mozilla.com
push dateThu, 14 Mar 2013 12:21:10 +0000
treeherdermozilla-central@96af92fa87fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs848939
milestone22.0a1
backs oute0a7ac3aee3dcd7954264bec00d8e402cebde0f8
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 e0a7ac3aee3d (bug 848939) for mochitest-1 failures on a CLOSED TREE.
toolkit/content/widgets/videocontrols.xml
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -21,16 +21,17 @@
       <xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
           <xbl:children/>
           <hbox class="timeThumb" xbl:inherits="showhours">
               <label class="timeLabel"/>
           </hbox>
       </xbl:content>
       <implementation>
 
+      <field name="timeLabel">null</field>
       <constructor>
           <![CDATA[
           this.timeLabel = document.getAnonymousElementByAttribute(this, "class", "timeLabel");
           this.timeLabel.setAttribute("value", "0:00");
           ]]>
       </constructor>
 
       <property name="showHours">
@@ -93,24 +94,28 @@
           var currTime = this.thumb.timeLabel.getAttribute("value");
           var totalTime = this.durationValue;
 
           return this.scrubberNameFormat.replace(/#1/, currTime).
               replace(/#2/, totalTime);
         </getter>
       </property>
 
+      <!-- Public -->
+      <field name="scrubberNameFormat">"&scrubberScale.nameFormat;"</field>
+      <field name="durationValue">""</field>
+
+      <field name="thumb">null</field>
+      <field name="valueBar">null</field>
+      <field name="isDragging">false</field>
+      <field name="wasPausedBeforeDrag">true</field>
+      <field name="type">null</field>
+      <field name="Utils">null</field>
       <constructor>
           <![CDATA[
-          this.scrubberNameFormat = ]]>"&scrubberScale.nameFormat;"<![CDATA[;
-          this.durationValue = "";
-          this.valueBar = null;
-          this.isDragging = false;
-          this.wasPausedBeforeDrag = true;
-
           this.thumb = document.getAnonymousElementByAttribute(this, "class", "scale-thumb");
           this.type = this.getAttribute("class");
           this.Utils = document.getBindingParent(this.parentNode).Utils;
           if (this.type == "scrubber")
               this.valueBar = this.Utils.progressBar;
           ]]>
       </constructor>
 
@@ -302,19 +307,24 @@
             </vbox>
         </stack>
     </xbl:content>
 
     <implementation>
 
         <constructor>
             <![CDATA[
-            this.isTouchControl = false;
-            this.randomID = 0;
-            this.Utils = {
+            this.Utils.init(this);
+            ]]>
+        </constructor>
+
+        <field name="randomID">0</field>
+
+        <field name="Utils">
+            <![CDATA[ ({
                 debug : false,
                 video : null,
                 videocontrols : null,
                 controlBar : null,
                 playButton : null,
                 muteButton : null,
                 volumeStack    : null,
                 volumeControl  : null,
@@ -1421,20 +1431,20 @@
                     }
 
                     addListener(this.videocontrols, "transitionend", this.onTransitionEnd);
                     addListener(this.video.ownerDocument, "mozfullscreenchange", this.setFullscreenButtonState);
                     addListener(this.video, "keypress", this.keyHandler);
 
                     this.log("--- videocontrols initialized ---");
                 }
-            };
-            this.Utils.init(this);
-            ]]>
-        </constructor>
+            }) ]]>
+        </field>
+
+        <field readonly="true" name="isTouchControl">false</field>
 
     </implementation>
 
     <handlers>
         <handler event="mouseover">
             if (!this.isTouchControl)
                 this.Utils.onMouseInOut(event);
         </handler>
@@ -1498,18 +1508,19 @@
                     </vbox>
                 </vbox>
             </vbox>
         </stack>
     </xbl:content>
 
     <implementation>
 
+        <field readonly="true" name="isTouchControl">true</field>
+
         <constructor>
-          this.isTouchControl = true;
           this.TouchUtils.init(this);
         </constructor>
 
         <field name="TouchUtils">
           <![CDATA[ ({
             videocontrols: null,
             controlsTimer : null,
             controlsTimeout : 5000,