From f9c68411988999024986b288d798e66099cf9c33 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Mon, 2 Dec 2013 11:16:19 +0000
Subject: [PATCH] Bug 940381 - Try to make mochitest loading more robust.
 r=dholbert

---
 content/svg/content/test/test_bbox.xhtml               | 2 +-
 content/svg/content/test/test_bounds.html              | 2 +-
 content/svg/content/test/test_dataTypes.html           | 2 +-
 content/svg/content/test/test_dataTypesModEvents.html  | 2 +-
 content/svg/content/test/test_fragments.html           | 2 +-
 content/svg/content/test/test_getCTM.html              | 2 +-
 content/svg/content/test/test_getSubStringLength.xhtml | 2 +-
 content/svg/content/test/test_scientific.html          | 2 +-
 content/svg/content/test/test_selectSubString.xhtml    | 2 +-
 content/svg/content/test/test_switch.xhtml             | 2 +-
 content/svg/content/test/test_text.html                | 2 +-
 content/svg/content/test/test_text_scaled.html         | 2 +-
 content/svg/content/test/test_text_selection.html      | 9 ++++-----
 content/svg/content/test/test_viewport.html            | 2 +-
 content/svg/content/test/test_zoom.xhtml               | 2 +-
 15 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/content/svg/content/test/test_bbox.xhtml b/content/svg/content/test/test_bbox.xhtml
index 98892bf4bb5b..f227f17e55a4 100644
--- a/content/svg/content/test/test_bbox.xhtml
+++ b/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>
diff --git a/content/svg/content/test/test_bounds.html b/content/svg/content/test/test_bounds.html
index fcd43ef36a44..02b85e1e1a11 100644
--- a/content/svg/content/test/test_bounds.html
+++ b/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>
diff --git a/content/svg/content/test/test_dataTypes.html b/content/svg/content/test/test_dataTypes.html
index 44b8eb47c72e..de266d905113 100644
--- a/content/svg/content/test/test_dataTypes.html
+++ b/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>
diff --git a/content/svg/content/test/test_dataTypesModEvents.html b/content/svg/content/test/test_dataTypesModEvents.html
index 25a7b95049fc..22aab356b273 100644
--- a/content/svg/content/test/test_dataTypesModEvents.html
+++ b/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>
diff --git a/content/svg/content/test/test_fragments.html b/content/svg/content/test/test_fragments.html
index 970e7a0b95e7..464aba9558de 100644
--- a/content/svg/content/test/test_fragments.html
+++ b/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>
diff --git a/content/svg/content/test/test_getCTM.html b/content/svg/content/test/test_getCTM.html
index cfc8f7218bed..e8cf6df0b7dc 100644
--- a/content/svg/content/test/test_getCTM.html
+++ b/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>
diff --git a/content/svg/content/test/test_getSubStringLength.xhtml b/content/svg/content/test/test_getSubStringLength.xhtml
index ccc2dd3427de..a948476d5844 100644
--- a/content/svg/content/test/test_getSubStringLength.xhtml
+++ b/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>
diff --git a/content/svg/content/test/test_scientific.html b/content/svg/content/test/test_scientific.html
index 54a6866163ed..ca7774fd370b 100644
--- a/content/svg/content/test/test_scientific.html
+++ b/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>
diff --git a/content/svg/content/test/test_selectSubString.xhtml b/content/svg/content/test/test_selectSubString.xhtml
index b480ed5b310c..f827f0e38436 100644
--- a/content/svg/content/test/test_selectSubString.xhtml
+++ b/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>
diff --git a/content/svg/content/test/test_switch.xhtml b/content/svg/content/test/test_switch.xhtml
index f8386c19b26e..5d849bb05b89 100644
--- a/content/svg/content/test/test_switch.xhtml
+++ b/content/svg/content/test/test_switch.xhtml
@@ -95,7 +95,7 @@ function run1()
   }
 }
 
-window.addEventListener("load", run, false);
+$("svg").addEventListener("load", run, false);
 
 ]]>
 </script>
diff --git a/content/svg/content/test/test_text.html b/content/svg/content/test/test_text.html
index ca03f2af3593..b2f69d000db3 100644
--- a/content/svg/content/test/test_text.html
+++ b/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>
diff --git a/content/svg/content/test/test_text_scaled.html b/content/svg/content/test/test_text_scaled.html
index deb3ae60b525..e042e99964c0 100644
--- a/content/svg/content/test/test_text_scaled.html
+++ b/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>
diff --git a/content/svg/content/test/test_text_selection.html b/content/svg/content/test/test_text_selection.html
index 1d5b3b533b93..e93196f97bdd 100644
--- a/content/svg/content/test/test_text_selection.html
+++ b/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>
diff --git a/content/svg/content/test/test_viewport.html b/content/svg/content/test/test_viewport.html
index ca8da049799f..d813ad20b1c6 100644
--- a/content/svg/content/test/test_viewport.html
+++ b/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>
diff --git a/content/svg/content/test/test_zoom.xhtml b/content/svg/content/test/test_zoom.xhtml
index ce920b29dbad..809ab0fd9814 100644
--- a/content/svg/content/test/test_zoom.xhtml
+++ b/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>