More orange-fixing. r=yellowish-red
authorJeff Walden <jwalden@mit.edu>
Sat, 22 Jan 2011 22:52:02 -0800
changeset 61221 bbcc51fa912b89282886ee9404afed5e482536bd
parent 61220 26bcf65a0229eb417a7d6069d7752085432e095e
child 61222 7da52f991c293c40455e78d41799f474c00dcf33
push id18277
push usercleary@mozilla.com
push dateTue, 25 Jan 2011 03:52:51 +0000
treeherdermozilla-central@7ee91bd90e7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersyellowish-red
milestone2.0b10pre
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
More orange-fixing. r=yellowish-red
docshell/test/chrome/bug113934_window.xul
docshell/test/chrome/bug215405_window.xul
docshell/test/chrome/docshell_helpers.js
layout/reftests/editor/xul/platform.js
toolkit/components/ctypes/tests/unit/test_jsctypes.js.in
--- a/docshell/test/chrome/bug113934_window.xul
+++ b/docshell/test/chrome/bug113934_window.xul
@@ -10,18 +10,18 @@
     </vbox>
     <spacer flex="1"/>
   </hbox>
   
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
     var imports = [ "SimpleTest", "is", "isnot", "ok", "snapshotWindow",
                     "compareSnapshots", "onerror" ];
-    for each (var import in imports) {
-      window[import] = window.opener.wrappedJSObject[import];
+    for each (var name in imports) {
+      window[name] = window.opener.wrappedJSObject[name];
     }
 
     function $(id) {
       return document.getElementById(id);
     }
 
     function addBrowser(parent, id, width, height) {
       var b =
--- a/docshell/test/chrome/bug215405_window.xul
+++ b/docshell/test/chrome/bug215405_window.xul
@@ -42,18 +42,18 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="600"
         height="600"
         onload="onLoad();"
         title="215405 test">
 
   <script type="application/javascript"><![CDATA[
     var imports = [ "SimpleTest", "is", "isnot", "ok"];
-    for each (var import in imports) {
-      window[import] = window.opener.wrappedJSObject[import];
+    for each (var name in imports) {
+      window[name] = window.opener.wrappedJSObject[name];
     }
 
     const text="MOZILLA";
     const nostoreURI = "http://mochi.test:8888/tests/docshell/test/chrome/" +
                        "215405_nostore.html";
     const nocacheURI = "https://example.com:443/tests/docshell/test/chrome/" +
                        "215405_nocache.html";
 
--- a/docshell/test/chrome/docshell_helpers.js
+++ b/docshell/test/chrome/docshell_helpers.js
@@ -1,15 +1,15 @@
 /**  
  * Import common SimpleTest methods so that they're usable in this window.
  */
 var imports = [ "SimpleTest", "is", "isnot", "ok", "onerror", "todo", 
   "todo_is", "todo_isnot" ];
-for each (var import in imports) {
-  window[import] = window.opener.wrappedJSObject[import];
+for each (var name in imports) {
+  window[name] = window.opener.wrappedJSObject[name];
 }
 
 /**
  * Define global constants and variables.
  */
 const NAV_NONE = 0;
 const NAV_BACK = 1;
 const NAV_FORWARD = 2;
--- a/layout/reftests/editor/xul/platform.js
+++ b/layout/reftests/editor/xul/platform.js
@@ -4,25 +4,25 @@
 // platform.
 
 var id;
 var ua = navigator.userAgent;
 
 if (/Windows/.test(ua)) {
   id = "win";
   if (/NT 5\.1/.test(ua) || /NT 5\.2; Win64/.test(ua))
-    var class = "winxp";
+    var classname = "winxp";
 }
 else if (/Linux/.test(ua))
   id = "linux";
 else if (/SunOS/.test(ua))
   id = "linux";
 else if (/Mac OS X/.test(ua))
   id = "mac";
 
 if (id)
   document.documentElement.setAttribute("id", id);
 else
   document.documentElement.appendChild(
     document.createTextNode("Unrecognized platform")
   );
-if (class)
-  document.documentElement.setAttribute("class", class);
+if (classname)
+  document.documentElement.setAttribute("class", classname);
--- a/toolkit/components/ctypes/tests/unit/test_jsctypes.js.in
+++ b/toolkit/components/ctypes/tests/unit/test_jsctypes.js.in
@@ -77,22 +77,22 @@ function do_check_throws(f, type, stack)
       do_check_true(true);
       return;
     }
     do_throw("expected " + type.name + " exception, caught " + exc, stack);
   }
   do_throw("expected " + type.name + " exception, none thrown", stack);
 }
 
-function do_check_class(obj, class, stack)
+function do_check_class(obj, classname, stack)
 {
   if (!stack)
     stack = Components.stack.caller;
 
-  do_check_eq(Object.prototype.toString.call(obj), "[object " + class + "]", stack);
+  do_check_eq(Object.prototype.toString.call(obj), "[object " + classname + "]", stack);
 }
 
 function run_test()
 {
   // Test ctypes.CType and ctypes.CData are set up correctly.
   run_abstract_class_tests();
 
   // open the library