Back out 01207a5deca5 and 34e30f1b46d8 (bug 848939) for Android bustage

toolkit/content/widgets/scale.xml

@@ -61,6 +61,8 @@
       <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)
@@ -71,7 +73,6 @@
 
       <constructor>
         <![CDATA[
-          this._userChanged = false;
           var value = parseInt(this.getAttribute("value"), 10);
           if (!isNaN(value))
             this.value = value;

toolkit/content/widgets/videocontrols.xml

@@ -26,6 +26,7 @@
       </xbl:content>
       <implementation>
 
+      <field name="timeLabel">null</field>
       <constructor>
           <![CDATA[
           this.timeLabel = document.getAnonymousElementByAttribute(this, "class", "timeLabel");
@@ -98,14 +99,18 @@
         </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;
@@ -307,10 +312,14 @@
 
         <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,
@@ -1427,19 +1436,10 @@
 
                     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>
 
@@ -1513,11 +1513,14 @@
 
     <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,
@@ -1630,9 +1633,8 @@
                 this.delayHideControls(this.Utils.HIDE_CONTROLS_TIMEOUT_MS);
               }
             }
-          };
-      ]]>
-      </constructor>
+          }) ]]>
+        </field>
 
     </implementation>