Bug 940381 - Try to make mochitest loading more robust. r=dholbert

content/svg/content/test/test_bbox.xhtml

@@ -65,7 +65,7 @@ function run()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", run, false);
+$("svg").addEventListener("load", run, false);
 
 //]]></script>
 </pre>

content/svg/content/test/test_bounds.html

@@ -156,7 +156,7 @@ function runTest()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTest, false);
+$("svg").addEventListener("load", runTest, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_dataTypes.html

@@ -375,7 +375,7 @@ function runTestsWithPref() {
   SpecialPowers.pushPrefEnv({ 'set': [['svg.marker-improvements.enabled', true]] }, runTests);
 }
 
-window.addEventListener("load", runTestsWithPref, false);
+$("svg").addEventListener("load", runTestsWithPref, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_dataTypesModEvents.html

@@ -251,7 +251,7 @@ function runTests()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTests, false);
+$("svg").addEventListener("load", runTests, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_fragments.html

@@ -84,7 +84,7 @@ function runTests()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTests, false);
+$("svg").addEventListener("load", runTests, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_getCTM.html

@@ -103,7 +103,7 @@ function runTest()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTest, false);
+$("svg").addEventListener("load", runTest, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_getSubStringLength.xhtml

@@ -100,7 +100,7 @@ function run()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", run, false);
+$("svg").addEventListener("load", run, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_scientific.html

@@ -77,7 +77,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=302971
 	SimpleTest.finish();
 	}
 
-	window.addEventListener("load", runTests, false);
+	$("svg").addEventListener("load", runTests, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_selectSubString.xhtml

@@ -59,7 +59,7 @@ function runTests()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTests, false);
+$("svg").addEventListener("load", runTests, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_switch.xhtml

@@ -95,7 +95,7 @@ function run1()
   }
 }
 
-window.addEventListener("load", run, false);
+$("svg").addEventListener("load", run, false);
 
 ]]>
 </script>

content/svg/content/test/test_text.html

@@ -181,7 +181,7 @@ function runTests() {
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTests, false);
+$("svg").addEventListener("load", runTests, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_text_scaled.html

@@ -135,7 +135,7 @@ function runTests() {
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTests, false);
+$("svg").addEventListener("load", runTests, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_text_selection.html

@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=655877
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 
-<iframe src="text-helper-selection.svg" width="400" height="300"></iframe>
+<iframe id="svg" src="text-helper-selection.svg" width="400" height="300"></iframe>
 
 <pre id="test">
 <script class="testbody" type="application/javascript">
@@ -61,9 +61,8 @@ function deselect()
 
 function testSelection()
 {
-  svg = document.getElementsByTagName("iframe")[0];
-  doc = svg.contentDocument;
-  win = svg.contentWindow;
+  doc = $("svg").contentDocument;
+  win = $("svg").contentWindow;
   dragstart = doc.getElementById("dragstart");
   dragend = doc.getElementById("dragend");
 
@@ -137,7 +136,7 @@ if (/Android/.test(navigator.userAgent)) {
   ok(true, "No need to test text selection with the mouse on Android.");
   SimpleTest.finish();
 } else {
-  window.addEventListener("load", runTest, false);
+  $("svg").addEventListener("load", runTest, false);
 }
 </script>
 </pre>

content/svg/content/test/test_viewport.html

@@ -71,7 +71,7 @@ function runTest()
   SimpleTest.finish();
 }
 
-window.addEventListener("load", runTest, false);
+$("svg").addEventListener("load", runTest, false);
 </script>
 </pre>
 </body>

content/svg/content/test/test_zoom.xhtml

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=547596
       SimpleTest.finish();
     }
 
-    window.addEventListener("load", runTests, false);
+    $("svg").addEventListener("load", runTests, false);
   </script>
 </body>
 </html>