Back out 01207a5deca5 and 34e30f1b46d8 (bug 848939) for Android bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 18 Mar 2013 22:34:39 -0700
changeset 125365 a58872e5c1bb2fdf5c58ffce7ec938eea8783da9
parent 125364 cdc2b811d0e268e7d7b19e581e8d6f12d305aee5
child 125366 323ac99c03763995fd717309ff85186e90b18dbe
push id24894
push userphilringnalda@gmail.com
push dateTue, 19 Mar 2013 05:34:57 +0000
treeherdermozilla-inbound@a58872e5c1bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs848939
milestone22.0a1
backs out01207a5deca5dcd068639557e66709ed7b5c9ebd
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
Back out 01207a5deca5 and 34e30f1b46d8 (bug 848939) for Android bustage
toolkit/content/widgets/scale.xml
toolkit/content/widgets/videocontrols.xml
--- a/toolkit/content/widgets/scale.xml
+++ b/toolkit/content/widgets/scale.xml
@@ -56,27 +56,28 @@
                            onset="return this._setIntegerAttribute('minpos', val);"/>
       <property name="max" onget="return this._getIntegerAttribute('maxpos', 100);"
                            onset="return this._setIntegerAttribute('maxpos', val);"/>
       <property name="increment" onget="return this._getIntegerAttribute('increment', 1);"
                                  onset="return this._setIntegerAttribute('increment', val);"/>
       <property name="pageIncrement" onget="return this._getIntegerAttribute('pageincrement', 10);"
                                      onset="return this._setIntegerAttribute('pageincrement', val);"/>
 
+      <field name="_userChanged">false</field>
+      <field name="_sliderElement"/>
       <property name="_slider" readonly="true">
         <getter>
           if (!this._sliderElement)
             this._sliderElement = document.getAnonymousElementByAttribute(this, "anonid", "slider");
           return this._sliderElement;
         </getter>
       </property>
 
       <constructor>
         <![CDATA[
-          this._userChanged = false;
           var value = parseInt(this.getAttribute("value"), 10);
           if (!isNaN(value))
             this.value = value;
           else if (this.min > 0)
             this.value = this.min;
           else if (this.max < 0)
             this.value = this.max;
         ]]>
--- 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,20 +307,24 @@
             </vbox>
         </stack>
     </xbl:content>
 
     <implementation>
 
         <constructor>
             <![CDATA[
-            this.isTouchControl = false;
-            this.randomID = 0;
+            this.Utils.init(this);
+            ]]>
+        </constructor>
 
-            this.Utils = {
+        <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,
@@ -1422,29 +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>
-        <destructor>
-            <![CDATA[
-            // randomID used to be a <field>, which meant that the XBL machinery
-            // undefined the property when the element was unbound. The code in
-            // this file actually depends on this, so now that randomID is an
-            // expando, we need to make sure to explicitly delete it.
-            delete this.randomID;
-            ]]>
-        </destructor>
+            }) ]]>
+        </field>
+
+        <field readonly="true" name="isTouchControl">false</field>
 
     </implementation>
 
     <handlers>
         <handler event="mouseover">
             if (!this.isTouchControl)
                 this.Utils.onMouseInOut(event);
         </handler>
@@ -1508,21 +1508,24 @@
                     </vbox>
                 </vbox>
             </vbox>
         </stack>
     </xbl:content>
 
     <implementation>
 
+        <field readonly="true" name="isTouchControl">true</field>
+
         <constructor>
-          <![CDATA[
-          this.isTouchControl = true;
           this.TouchUtils.init(this);
-          this.TouchUtils = {
+        </constructor>
+
+        <field name="TouchUtils">
+          <![CDATA[ ({
             videocontrols: null,
             controlsTimer : null,
             controlsTimeout : 5000,
             positionLabel: null,
 
             get Utils() {
               return this.videocontrols.Utils;
             },
@@ -1625,19 +1628,18 @@
               // If the video is not at the start, then we probably just
               // transitioned into or out of fullscreen mode, and we don't want
               // the controls to remain visible. this.controlsTimeout is a full
               // 5s, which feels too long after the transition.
               if (video.currentTime !== 0) {
                 this.delayHideControls(this.Utils.HIDE_CONTROLS_TIMEOUT_MS);
               }
             }
-          };
-      ]]>
-      </constructor>
+          }) ]]>
+        </field>
 
     </implementation>
 
     <handlers>
         <handler event="mouseup">
           if(event.originalTarget.nodeName == "vbox") {
             if (this.TouchUtils.firstShow)
               this.Utils.video.play();