From 9e3375fb45f5f852f19f66d1a8d5e25e74dd3d51 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 16 May 2013 01:53:03 +0100
Subject: [PATCH] Bug 872619 - Stop using 'load' in many SVG reftests, and use
 MozReftestInvalidate instead, and flag the fallback setTimeouts. r=dholbert

--HG--
extra : rebase_source : c41d8fb0048e6c6eea70db12d5b6e976fc442b69
---
 layout/reftests/svg/as-image/svg-image-script-2.svg  |  3 +--
 .../reftests/svg/as-image/svg-image-visited-1.html   | 12 +++++++-----
 .../reftests/svg/as-image/svg-image-visited-2.html   | 12 +++++++-----
 layout/reftests/svg/dynamic-clipPath-01.svg          |  3 +--
 layout/reftests/svg/dynamic-clipPath-02.svg          |  3 +--
 layout/reftests/svg/dynamic-filter-contents-01a.svg  |  3 +--
 layout/reftests/svg/dynamic-filter-contents-01b.svg  |  3 +--
 layout/reftests/svg/dynamic-gradient-contents-01.svg |  3 +--
 layout/reftests/svg/dynamic-gradient-contents-02.svg |  3 +--
 layout/reftests/svg/dynamic-inner-svg-01.svg         |  3 +--
 layout/reftests/svg/dynamic-marker-01.svg            |  3 +--
 layout/reftests/svg/dynamic-marker-02.svg            |  3 +--
 layout/reftests/svg/dynamic-marker-03.svg            |  3 +--
 layout/reftests/svg/dynamic-mask-01.svg              |  3 +--
 layout/reftests/svg/dynamic-mask-contents-01.svg     |  3 +--
 layout/reftests/svg/dynamic-pattern-01.svg           |  3 +--
 layout/reftests/svg/dynamic-pattern-02.svg           |  9 +++------
 layout/reftests/svg/dynamic-pattern-contents-01.svg  |  9 +++------
 layout/reftests/svg/dynamic-pattern-contents-02.svg  |  9 +++------
 .../svg/dynamic-small-object-scaled-up-01.svg        |  4 +---
 .../svg/dynamic-small-object-scaled-up-02.svg        |  4 +---
 layout/reftests/svg/dynamic-text-04.svg              |  3 +--
 layout/reftests/svg/dynamic-text-05.svg              |  9 ++++-----
 layout/reftests/svg/dynamic-text-06.svg              |  4 +++-
 layout/reftests/svg/dynamic-textPath-01.svg          |  9 +++------
 layout/reftests/svg/dynamic-textPath-02.svg          |  9 +++------
 layout/reftests/svg/dynamic-textPath-03.svg          |  9 +++------
 layout/reftests/svg/dynamic-use-03.svg               |  3 +--
 layout/reftests/svg/dynamic-use-04.svg               |  3 +--
 layout/reftests/svg/dynamic-use-05.svg               |  3 +--
 layout/reftests/svg/dynamic-use-06.svg               |  3 +--
 layout/reftests/svg/filter-invalidation-01.svg       |  2 +-
 .../filters/dynamic-filtered-foreignObject-01.svg    |  2 +-
 .../svg/foreignObject-ancestor-style-change-01.svg   | 10 +++-------
 .../svg/foreignObject-change-transform-01.svg        | 10 +++-------
 layout/reftests/svg/foreignObject-display-01.svg     | 11 ++++++-----
 .../reftests/svg/foreignObject-move-repaint-01.svg   | 10 +++-------
 .../reftests/svg/foreignObject-start-hidden-01.svg   | 10 ++++------
 .../reftests/svg/foreignObject-start-hidden-02.svg   | 10 ++++------
 .../reftests/svg/foreignObject-style-change-01.svg   |  9 +++------
 .../reftests/svg/outer-svg-border-and-padding-01.svg |  2 +-
 .../svg/smil/anim-filter-primitive-size-01.svg       |  3 +--
 layout/reftests/svg/smil/anim-filter-size-01.svg     |  3 +--
 layout/reftests/svg/smil/anim-view-01.svg            |  3 +--
 layout/reftests/svg/smil/event/event-seek-1.svg      |  5 +++--
 .../svg/smil/event/event-target-non-svg-1.xhtml      |  6 +++++-
 layout/reftests/svg/smil/sort/sort-startSame-1b.svg  |  5 +++--
 .../svg/smil/syncbase/cross-container-3.xhtml        |  6 +++++-
 layout/reftests/svg/smil/timed/appendChild-1a.svg    |  9 ++++++---
 layout/reftests/svg/smil/timed/appendChild-1b.svg    |  9 ++++++---
 layout/reftests/svg/smil/timed/appendChild-2a.svg    |  9 ++++++---
 layout/reftests/svg/smil/timed/appendChild-2b.svg    |  9 ++++++---
 layout/reftests/svg/smil/timed/paced-1.svg           |  9 ++++++---
 layout/reftests/svg/smil/timed/pause-1.svg           |  9 ++++++---
 layout/reftests/svg/smil/timed/removeChild-1.svg     |  9 ++++++---
 layout/reftests/svg/smil/timed/removeChild-2.svg     |  9 ++++++---
 layout/reftests/svg/suspend-02.svg                   |  3 +--
 layout/reftests/svg/suspend-04.svg                   |  3 +--
 58 files changed, 158 insertions(+), 183 deletions(-)

diff --git a/layout/reftests/svg/as-image/svg-image-script-2.svg b/layout/reftests/svg/as-image/svg-image-script-2.svg
index 4059d133278a..84aeaf1342a8 100644
--- a/layout/reftests/svg/as-image/svg-image-script-2.svg
+++ b/layout/reftests/svg/as-image/svg-image-script-2.svg
@@ -10,8 +10,7 @@
   <rect id="r1" width="100%" height="100%" fill="transparent"/>
   <script type="application/javascript">
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
       // force a repaint
diff --git a/layout/reftests/svg/as-image/svg-image-visited-1.html b/layout/reftests/svg/as-image/svg-image-visited-1.html
index e797efb20a62..d0a6d1f358e1 100644
--- a/layout/reftests/svg/as-image/svg-image-visited-1.html
+++ b/layout/reftests/svg/as-image/svg-image-visited-1.html
@@ -1,6 +1,5 @@
 <!--
      Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/licenses/publicdomain/
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html class="reftest-wait">
@@ -10,12 +9,15 @@
       function snapshot() {
         document.documentElement.removeAttribute("class");
       }
+      function delay_snapshot() {
+        setTimeout(snapshot, 100); // delay snapshot to allow time for
+                                   // :visited style inside the image to
+                                   // resolve (which it hopefully won't)
+      }
+      document.addEventListener("MozReftestInvalidate", delay_snapshot, false);
     </script>
   </head>
-
-  <!-- Wait 100ms before taking snapshot, to be sure we've allowed time for
-       :visited style inside the image to resolve (which it hopefully won't) -->
-  <body style="margin: 0" onload="setTimeout(snapshot, 100)">
+  <body style="margin: 0">
     <img src="svg-image-visited-1-helper.svg">
   </body>
 </html>
diff --git a/layout/reftests/svg/as-image/svg-image-visited-2.html b/layout/reftests/svg/as-image/svg-image-visited-2.html
index 48110a6a578e..e1c66698c47a 100644
--- a/layout/reftests/svg/as-image/svg-image-visited-2.html
+++ b/layout/reftests/svg/as-image/svg-image-visited-2.html
@@ -1,6 +1,5 @@
 <!--
      Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/licenses/publicdomain/
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html class="reftest-wait">
@@ -10,12 +9,15 @@
       function snapshot() {
         document.documentElement.removeAttribute("class");
       }
+      function delay_snapshot() {
+        setTimeout(snapshot, 100); // delay snapshot to allow time for
+                                   // :visited style inside the image to
+                                   // resolve (which it hopefully won't)
+      }
+      document.addEventListener("MozReftestInvalidate", delay_snapshot, false);
     </script>
   </head>
-
-  <!-- Wait 100ms before taking snapshot, to be sure we've allowed time for
-       :visited style inside the image to resolve (which it hopefully won't) -->
-  <body style="margin: 0" onload="setTimeout(snapshot, 100)">
+  <body style="margin: 0">
     <img src="svg-image-visited-2-helper.svg">
   </body>
 </html>
diff --git a/layout/reftests/svg/dynamic-clipPath-01.svg b/layout/reftests/svg/dynamic-clipPath-01.svg
index 6c31a7cda5de..1d1e86ebb861 100644
--- a/layout/reftests/svg/dynamic-clipPath-01.svg
+++ b/layout/reftests/svg/dynamic-clipPath-01.svg
@@ -82,8 +82,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
 
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-clipPath-02.svg b/layout/reftests/svg/dynamic-clipPath-02.svg
index 226369656fd3..81459e2359d1 100644
--- a/layout/reftests/svg/dynamic-clipPath-02.svg
+++ b/layout/reftests/svg/dynamic-clipPath-02.svg
@@ -23,8 +23,7 @@
   <script>
     function startTest() {
       document.addEventListener("MozReftestInvalidate", doTest, false);
-      // in case we're not gecko
-      setTimeout(doTest, 5000);
+      setTimeout(doTest, 4000); // fallback for running outside reftest
     }
 
     function doTest() {
diff --git a/layout/reftests/svg/dynamic-filter-contents-01a.svg b/layout/reftests/svg/dynamic-filter-contents-01a.svg
index 4a93d39e3790..4c5fe6a48cc9 100644
--- a/layout/reftests/svg/dynamic-filter-contents-01a.svg
+++ b/layout/reftests/svg/dynamic-filter-contents-01a.svg
@@ -20,8 +20,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
 
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-filter-contents-01b.svg b/layout/reftests/svg/dynamic-filter-contents-01b.svg
index 87d98aa3dc60..c85bf7b606ad 100644
--- a/layout/reftests/svg/dynamic-filter-contents-01b.svg
+++ b/layout/reftests/svg/dynamic-filter-contents-01b.svg
@@ -16,8 +16,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
 
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-gradient-contents-01.svg b/layout/reftests/svg/dynamic-gradient-contents-01.svg
index 4bb42c3fcf64..d437b7e023aa 100644
--- a/layout/reftests/svg/dynamic-gradient-contents-01.svg
+++ b/layout/reftests/svg/dynamic-gradient-contents-01.svg
@@ -21,8 +21,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
 
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-gradient-contents-02.svg b/layout/reftests/svg/dynamic-gradient-contents-02.svg
index 6b09e3a92b05..8d620816d3fd 100644
--- a/layout/reftests/svg/dynamic-gradient-contents-02.svg
+++ b/layout/reftests/svg/dynamic-gradient-contents-02.svg
@@ -24,8 +24,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
 
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-inner-svg-01.svg b/layout/reftests/svg/dynamic-inner-svg-01.svg
index 474ea5c30565..8709a574a6d8 100644
--- a/layout/reftests/svg/dynamic-inner-svg-01.svg
+++ b/layout/reftests/svg/dynamic-inner-svg-01.svg
@@ -10,8 +10,7 @@
 
 function startTest() {
   document.addEventListener("MozReftestInvalidate", boom, false);
-  // in case we're not gecko
-  setTimeout(boom, 5000);
+  setTimeout(boom, 4000); // fallback for running outside reftest
 }
 
 function boom() {
diff --git a/layout/reftests/svg/dynamic-marker-01.svg b/layout/reftests/svg/dynamic-marker-01.svg
index 62d234ab3bd3..7bd0e60723a5 100644
--- a/layout/reftests/svg/dynamic-marker-01.svg
+++ b/layout/reftests/svg/dynamic-marker-01.svg
@@ -18,8 +18,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
   
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-marker-02.svg b/layout/reftests/svg/dynamic-marker-02.svg
index 93cb4d434f47..356e39fd067e 100644
--- a/layout/reftests/svg/dynamic-marker-02.svg
+++ b/layout/reftests/svg/dynamic-marker-02.svg
@@ -10,8 +10,7 @@
 
 function startTest() {
   document.addEventListener("MozReftestInvalidate", boom, false);
-  // in case we're not gecko
-  setTimeout(boom, 5000);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 }
 
 function boom() {
diff --git a/layout/reftests/svg/dynamic-marker-03.svg b/layout/reftests/svg/dynamic-marker-03.svg
index 473b2d5e7cff..a4944bd906f5 100644
--- a/layout/reftests/svg/dynamic-marker-03.svg
+++ b/layout/reftests/svg/dynamic-marker-03.svg
@@ -16,8 +16,7 @@ function doTest() {
 }
 
 document.addEventListener("MozReftestInvalidate", doTest, false);
-// in case we're not gecko
-setTimeout(doTest, 3000);
+setTimeout(doTest, 4000); // fallback for running outside reftest
 
 ]]>
   </script>
diff --git a/layout/reftests/svg/dynamic-mask-01.svg b/layout/reftests/svg/dynamic-mask-01.svg
index 59cb3f050dae..7a0e428ee78a 100644
--- a/layout/reftests/svg/dynamic-mask-01.svg
+++ b/layout/reftests/svg/dynamic-mask-01.svg
@@ -31,8 +31,7 @@
   <script>
     function startTest() {
       document.addEventListener("MozReftestInvalidate", doTest, false);
-      // in case we're not gecko
-      setTimeout(doTest, 5000);
+      setTimeout(doTest, 4000); // fallback for running outside reftest
     }
 
     function doTest() {
diff --git a/layout/reftests/svg/dynamic-mask-contents-01.svg b/layout/reftests/svg/dynamic-mask-contents-01.svg
index 454352c688e6..10d6222e25f5 100644
--- a/layout/reftests/svg/dynamic-mask-contents-01.svg
+++ b/layout/reftests/svg/dynamic-mask-contents-01.svg
@@ -18,8 +18,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
 
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-pattern-01.svg b/layout/reftests/svg/dynamic-pattern-01.svg
index f97cefdc5c5a..e129d24493cf 100644
--- a/layout/reftests/svg/dynamic-pattern-01.svg
+++ b/layout/reftests/svg/dynamic-pattern-01.svg
@@ -72,8 +72,7 @@
   <script>
   function startTest() {
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
   }
 
   function doTest() {
diff --git a/layout/reftests/svg/dynamic-pattern-02.svg b/layout/reftests/svg/dynamic-pattern-02.svg
index 62a78fec0bb7..f63492f6969e 100644
--- a/layout/reftests/svg/dynamic-pattern-02.svg
+++ b/layout/reftests/svg/dynamic-pattern-02.svg
@@ -3,7 +3,7 @@
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait"
-     xmlns:xlink="http://www.w3.org/1999/xlink" onload="startTest()">
+     xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>Testing that href changes are live</title>
   <defs>
     <pattern id="r1" width="100%" height="100%" patternUnits="userSpaceOnUse">
@@ -18,11 +18,8 @@
   <rect id="u1" width="100%" height="100%" fill="url(#r1)"/>
 
   <script>
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 
   function doTest() {
     document.getElementById("r1").setAttributeNS("http://www.w3.org/1999/xlink", "href", "#r2");
diff --git a/layout/reftests/svg/dynamic-pattern-contents-01.svg b/layout/reftests/svg/dynamic-pattern-contents-01.svg
index a41a55542490..b692de10c067 100644
--- a/layout/reftests/svg/dynamic-pattern-contents-01.svg
+++ b/layout/reftests/svg/dynamic-pattern-contents-01.svg
@@ -3,7 +3,7 @@
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait"
-     xmlns:xlink="http://www.w3.org/1999/xlink" onload="startTest()">
+     xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>Testing that style changes are reflected in patterns</title>
   <style>
     .foo { fill:lime; }
@@ -21,11 +21,8 @@
   <rect id="u1" width="100%" height="100%" fill="url(#r1)"/>
 
   <script>
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 
   function doTest() {
     document.getElementById("d").setAttribute("class", "foo");
diff --git a/layout/reftests/svg/dynamic-pattern-contents-02.svg b/layout/reftests/svg/dynamic-pattern-contents-02.svg
index 596a66f95d43..d3da2e19f0a7 100644
--- a/layout/reftests/svg/dynamic-pattern-contents-02.svg
+++ b/layout/reftests/svg/dynamic-pattern-contents-02.svg
@@ -3,7 +3,7 @@
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait"
-     xmlns:xlink="http://www.w3.org/1999/xlink" onload="startTest()">
+     xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>Testing that ID-map changes are tracked by pattern inheritance</title>
   <defs>
     <pattern id="r1" width="100%" height="100%" patternUnits="userSpaceOnUse" xlink:href="#r2">
@@ -18,11 +18,8 @@
   <rect id="u1" width="100%" height="100%" fill="url(#r1)"/>
 
   <script>
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 
   function doTest() {
     document.getElementById("r0").setAttribute("id", "r2");
diff --git a/layout/reftests/svg/dynamic-small-object-scaled-up-01.svg b/layout/reftests/svg/dynamic-small-object-scaled-up-01.svg
index 70060e4a6999..4f21d0617422 100644
--- a/layout/reftests/svg/dynamic-small-object-scaled-up-01.svg
+++ b/layout/reftests/svg/dynamic-small-object-scaled-up-01.svg
@@ -19,9 +19,7 @@ function move_small_object()
 }
 
 document.addEventListener("MozReftestInvalidate", move_small_object, false);
-
-// fallback for browsers that don't support MozReftestInvalidate
-setTimeout(move_small_object, 1000);
+setTimeout(move_small_objects, 4000); // fallback for running outside reftest
 
   //]]></script>
   <rect width="100%" height="100%" fill="lime"/>
diff --git a/layout/reftests/svg/dynamic-small-object-scaled-up-02.svg b/layout/reftests/svg/dynamic-small-object-scaled-up-02.svg
index bf23045123cd..9e34ce8ab023 100644
--- a/layout/reftests/svg/dynamic-small-object-scaled-up-02.svg
+++ b/layout/reftests/svg/dynamic-small-object-scaled-up-02.svg
@@ -19,9 +19,7 @@ function move_small_object()
 }
 
 document.addEventListener("MozReftestInvalidate", move_small_object, false);
-
-// fallback for browsers that don't support MozReftestInvalidate
-setTimeout(move_small_object, 500);
+setTimeout(move_small_objects, 4000); // fallback for running outside reftest
 
   //]]></script>
   <rect width="100%" height="100%" fill="lime"/>
diff --git a/layout/reftests/svg/dynamic-text-04.svg b/layout/reftests/svg/dynamic-text-04.svg
index 904cc513752c..b2fab69ac5cb 100644
--- a/layout/reftests/svg/dynamic-text-04.svg
+++ b/layout/reftests/svg/dynamic-text-04.svg
@@ -8,8 +8,7 @@
   <script type="text/javascript">
 
 document.addEventListener("MozReftestInvalidate", go, false);
-// in case we're not gecko
-setTimeout(go, 3000);
+setTimeout(go, 4000); // fallback for running outside reftest
 
 function go() {
   document.getElementById("parent").setAttribute("rotate", "5,15,25,35,45,55");
diff --git a/layout/reftests/svg/dynamic-text-05.svg b/layout/reftests/svg/dynamic-text-05.svg
index 5c4e679fce5c..f1e8ddf625da 100644
--- a/layout/reftests/svg/dynamic-text-05.svg
+++ b/layout/reftests/svg/dynamic-text-05.svg
@@ -2,15 +2,14 @@
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait" onload="startTest()">
+<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait">
 
   <title>Testcase for text removal</title>
 
   <script>
-    function startTest() {
-      document.addEventListener("MozReftestInvalidate", doTest, false);
-      setTimeout(doTest, 5000); // for non-gecko-reftest-harness viewers
-    }
+    document.addEventListener("MozReftestInvalidate", doTest, false);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
+
     function doTest() {
       document.getElementById("text").firstChild.nodeValue='';
       document.documentElement.removeAttribute("class");
diff --git a/layout/reftests/svg/dynamic-text-06.svg b/layout/reftests/svg/dynamic-text-06.svg
index db8252ea5710..8c4d0f851e46 100644
--- a/layout/reftests/svg/dynamic-text-06.svg
+++ b/layout/reftests/svg/dynamic-text-06.svg
@@ -2,7 +2,7 @@
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait" onload="sample()">
+<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait">
   <script>
     var curXScale = 3;
     function sample() {
@@ -16,6 +16,8 @@
         document.documentElement.removeAttribute('class');
       }
     }
+    document.addEventListener("MozReftestInvalidate", sample, false);
+    setTimeout(sample, 4000); // fallback for running outside reftest
   </script>
 
   <rect width="100%" height="100%" fill="lime"/>
diff --git a/layout/reftests/svg/dynamic-textPath-01.svg b/layout/reftests/svg/dynamic-textPath-01.svg
index 377b21214bb4..01df1b70c542 100644
--- a/layout/reftests/svg/dynamic-textPath-01.svg
+++ b/layout/reftests/svg/dynamic-textPath-01.svg
@@ -2,7 +2,7 @@
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait" onload="startTest()" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait" xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>Testing that dynamic changes to the element for a given ID are reflected in textPath</title>
   <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=458010 -->
   <defs>
@@ -14,11 +14,8 @@
   </text>
 
   <script>
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
   
   function doTest() {
     // check that changing an id to "m1" lets l1 find it
diff --git a/layout/reftests/svg/dynamic-textPath-02.svg b/layout/reftests/svg/dynamic-textPath-02.svg
index a1433ba9db61..6775258618a0 100644
--- a/layout/reftests/svg/dynamic-textPath-02.svg
+++ b/layout/reftests/svg/dynamic-textPath-02.svg
@@ -4,7 +4,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="startTest()" class="reftest-wait">
+     class="reftest-wait">
   <title>Test for changes to the IDs in the document causing textPath references to update</title>
 
   <defs>
@@ -15,11 +15,8 @@
   <text style="16px sans-serif"><textPath xlink:href="#p1">Hello</textPath></text>
 
   <script>
-    function startTest() {
-      window.addEventListener("MozReftestInvalidate", doTest, false);
-      // in case we're not in the reftest harness
-      setTimeout(doTest, 5000);
-    }
+    document.addEventListener("MozReftestInvalidate", doTest, false);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
       document.getElementsByTagName("path")[0].removeAttribute("id");
diff --git a/layout/reftests/svg/dynamic-textPath-03.svg b/layout/reftests/svg/dynamic-textPath-03.svg
index a35c36d29b1d..6c604daf0bba 100644
--- a/layout/reftests/svg/dynamic-textPath-03.svg
+++ b/layout/reftests/svg/dynamic-textPath-03.svg
@@ -4,7 +4,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="startTest()" class="reftest-wait" id="p1">
+     class="reftest-wait" id="p1">
   <title>Test for changes to the IDs in the document causing textPath references to update</title>
 
   <defs>
@@ -14,11 +14,8 @@
   <text style="16px sans-serif"><textPath xlink:href="#p1">Hello</textPath></text>
 
   <script>
-    function startTest() {
-      window.addEventListener("MozReftestInvalidate", doTest, false);
-      // in case we're not in the reftest harness
-      setTimeout(doTest, 5000);
-    }
+    document.addEventListener("MozReftestInvalidate", doTest, false);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
       document.documentElement.removeAttribute("id");
diff --git a/layout/reftests/svg/dynamic-use-03.svg b/layout/reftests/svg/dynamic-use-03.svg
index 60598a5f8688..345d7b30c8ee 100644
--- a/layout/reftests/svg/dynamic-use-03.svg
+++ b/layout/reftests/svg/dynamic-use-03.svg
@@ -12,8 +12,7 @@
   <script type="text/javascript">
 
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
       var u = document.getElementById("u");
diff --git a/layout/reftests/svg/dynamic-use-04.svg b/layout/reftests/svg/dynamic-use-04.svg
index c791c9274de8..71f96472f38c 100644
--- a/layout/reftests/svg/dynamic-use-04.svg
+++ b/layout/reftests/svg/dynamic-use-04.svg
@@ -13,8 +13,7 @@
     <![CDATA[
 
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
         // Since the <use> does not reference an <svg> or <symbol>, the value
diff --git a/layout/reftests/svg/dynamic-use-05.svg b/layout/reftests/svg/dynamic-use-05.svg
index 3938393caab1..056c89c062ab 100644
--- a/layout/reftests/svg/dynamic-use-05.svg
+++ b/layout/reftests/svg/dynamic-use-05.svg
@@ -18,8 +18,7 @@
     <![CDATA[
 
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
         var u = document.getElementById("u");
diff --git a/layout/reftests/svg/dynamic-use-06.svg b/layout/reftests/svg/dynamic-use-06.svg
index c2f6b05a89b0..41974db94631 100644
--- a/layout/reftests/svg/dynamic-use-06.svg
+++ b/layout/reftests/svg/dynamic-use-06.svg
@@ -19,8 +19,7 @@
     <![CDATA[
 
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
         var svg = document.getElementById("svg");
diff --git a/layout/reftests/svg/filter-invalidation-01.svg b/layout/reftests/svg/filter-invalidation-01.svg
index 14d586433220..442b3a731244 100644
--- a/layout/reftests/svg/filter-invalidation-01.svg
+++ b/layout/reftests/svg/filter-invalidation-01.svg
@@ -17,7 +17,7 @@ function hide_red_rect()
 }
 
 document.addEventListener("MozReftestInvalidate", hide_red_rect, false);
-setTimeout(hide_red_rect, 5000)
+setTimeout(hide_red_rect, 4000); // fallback for running outside reftest
 
   //]]></script>
   <rect width="100%" height="100%" fill="lime"/>
diff --git a/layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg b/layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg
index 06dbc8192c71..2320f21cf6d4 100644
--- a/layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg
+++ b/layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg
@@ -13,7 +13,7 @@ function run_test() {
 }
 
 document.addEventListener("MozReftestInvalidate", run_test);
-setTimeout(run_test, 3000);
+setTimeout(run_test, 4000); // fallback for running outside reftest
 
   </script>
   <filter id="filter" x="0" y="0" width="150" height="150"
diff --git a/layout/reftests/svg/foreignObject-ancestor-style-change-01.svg b/layout/reftests/svg/foreignObject-ancestor-style-change-01.svg
index 8378066c56c7..be4e9749eb54 100644
--- a/layout/reftests/svg/foreignObject-ancestor-style-change-01.svg
+++ b/layout/reftests/svg/foreignObject-ancestor-style-change-01.svg
@@ -2,8 +2,7 @@
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
-     onload="startTest()" class="reftest-wait">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait">
 
   <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=381285 -->
 
@@ -16,11 +15,8 @@
 
   <script>
 
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 
   function doTest() {
     document.getElementById('g').style.fontSize = '16px';
diff --git a/layout/reftests/svg/foreignObject-change-transform-01.svg b/layout/reftests/svg/foreignObject-change-transform-01.svg
index e395a1907df1..6f165dc25483 100644
--- a/layout/reftests/svg/foreignObject-change-transform-01.svg
+++ b/layout/reftests/svg/foreignObject-change-transform-01.svg
@@ -4,8 +4,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:html="http://www.w3.org/1999/xhtml"
-     class="reftest-wait"
-     onload="startTest()">
+     class="reftest-wait">
 
   <title>Testcase for changing the 'transform' on foreignObject</title>
 
@@ -17,11 +16,8 @@
 // After the rect has rendered the transform on the 
 // foreignObject is removed and the green div should fill the viewport.
 
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 
   function doTest() {
     document.getElementById('fo').setAttribute('transform', '');
diff --git a/layout/reftests/svg/foreignObject-display-01.svg b/layout/reftests/svg/foreignObject-display-01.svg
index 2d3e171cf415..dfdbc0eca2c4 100644
--- a/layout/reftests/svg/foreignObject-display-01.svg
+++ b/layout/reftests/svg/foreignObject-display-01.svg
@@ -2,8 +2,7 @@
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
-     onload="setTimeout(handleLoad, 0);">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait">
 
   <title>Testcase for removing display:none from foreignObject child</title>
 
@@ -12,13 +11,15 @@
   <script type="application/ecmascript">
   <![CDATA[
 
-// This must be called using setTimeout since it was _after_ loading we failed
-
-function handleLoad(event)
+function doTest(event)
 {
   document.getElementById('div').style.display = 'block';
+  document.documentElement.removeAttribute('class');
 }
 
+document.addEventListener("MozReftestInvalidate", doTest, false);
+setTimeout(doTest, 4000); // fallback for running outside reftest
+
   ]]>
   </script>
   <rect width="100%" height="100%" fill="red"/>
diff --git a/layout/reftests/svg/foreignObject-move-repaint-01.svg b/layout/reftests/svg/foreignObject-move-repaint-01.svg
index 9c058d9a488a..43dd296286f0 100644
--- a/layout/reftests/svg/foreignObject-move-repaint-01.svg
+++ b/layout/reftests/svg/foreignObject-move-repaint-01.svg
@@ -4,8 +4,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:html="http://www.w3.org/1999/xhtml"
-     class="reftest-wait"
-     onload="startTest()">
+     class="reftest-wait">
 
   <title>Testcase for repaint of the area previously covered by a foreignObject</title>
 
@@ -17,11 +16,8 @@
 // has rendered the foreignObject (and thus div) is moved out
 // of the viewport which should then be filled by the green rect as a result.
 
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 
   function doTest() {
     document.getElementById('fo').setAttribute('y', '100%');
diff --git a/layout/reftests/svg/foreignObject-start-hidden-01.svg b/layout/reftests/svg/foreignObject-start-hidden-01.svg
index 5dcacddb905f..d6464b7f0002 100644
--- a/layout/reftests/svg/foreignObject-start-hidden-01.svg
+++ b/layout/reftests/svg/foreignObject-start-hidden-01.svg
@@ -1,11 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait"
-     height="0" width="0"
-     onload="startTest()">
+     height="0" width="0">
   <script>
-    function startTest() {
-      document.addEventListener("MozReftestInvalidate", doTest, false);
-      setTimeout(doTest, 5000); // for non-gecko-reftest-harness viewers
-    }
+    document.addEventListener("MozReftestInvalidate", doTest, false);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
+
     function doTest() {
       document.documentElement.removeAttribute("width");
       document.documentElement.removeAttribute("height");
diff --git a/layout/reftests/svg/foreignObject-start-hidden-02.svg b/layout/reftests/svg/foreignObject-start-hidden-02.svg
index d2dd784aa2bf..fc95ef5acf28 100644
--- a/layout/reftests/svg/foreignObject-start-hidden-02.svg
+++ b/layout/reftests/svg/foreignObject-start-hidden-02.svg
@@ -1,11 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait"
-     height="0" width="0" viewBox="0 0 50 50" preserveAspectRatio="none"
-     onload="startTest()">
+     height="0" width="0" viewBox="0 0 50 50" preserveAspectRatio="none">
   <script>
-    function startTest() {
-      document.addEventListener("MozReftestInvalidate", doTest, false);
-      setTimeout(doTest, 5000); // for non-gecko-reftest-harness viewers
-    }
+    document.addEventListener("MozReftestInvalidate", doTest, false);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
+
     function doTest() {
       document.documentElement.removeAttribute("width");
       document.documentElement.removeAttribute("height");
diff --git a/layout/reftests/svg/foreignObject-style-change-01.svg b/layout/reftests/svg/foreignObject-style-change-01.svg
index 9450b0a17bd7..eaf52c6b31e4 100644
--- a/layout/reftests/svg/foreignObject-style-change-01.svg
+++ b/layout/reftests/svg/foreignObject-style-change-01.svg
@@ -3,7 +3,7 @@
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1"
-     onload="startTest()" class="reftest-wait">
+     class="reftest-wait">
 
   <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=708155 -->
 
@@ -11,11 +11,8 @@
 
   <script>
 
-  function startTest() {
-    document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
-  }
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+  setTimeout(doTest, 4000); // fallback for running outside reftest
 
   function doTest() {
     document.getElementById('fo').style.opacity = '1';
diff --git a/layout/reftests/svg/outer-svg-border-and-padding-01.svg b/layout/reftests/svg/outer-svg-border-and-padding-01.svg
index 6eb34c8401bb..f9f7b206859f 100644
--- a/layout/reftests/svg/outer-svg-border-and-padding-01.svg
+++ b/layout/reftests/svg/outer-svg-border-and-padding-01.svg
@@ -42,7 +42,7 @@ function hide_red_rects()
 }
 
 document.addEventListener("MozReftestInvalidate", hide_red_rects, false);
-setTimeout(hide_red_rects, 1000)
+setTimeout(hide_red_rects, 4000); // fallback for running outside reftest
 
   //]]>
   </script>
diff --git a/layout/reftests/svg/smil/anim-filter-primitive-size-01.svg b/layout/reftests/svg/smil/anim-filter-primitive-size-01.svg
index 90c6927f14dc..ceb7c32856a9 100644
--- a/layout/reftests/svg/smil/anim-filter-primitive-size-01.svg
+++ b/layout/reftests/svg/smil/anim-filter-primitive-size-01.svg
@@ -6,8 +6,7 @@
   <script>
 
 window.addEventListener("MozReftestInvalidate", run, false);
-
-setTimeout(run, 3000); // for non-gecko
+setTimeout(run, 4000); // fallback for running outside reftest
 
 function run() {
   setTimeAndSnapshot(1, true)
diff --git a/layout/reftests/svg/smil/anim-filter-size-01.svg b/layout/reftests/svg/smil/anim-filter-size-01.svg
index 86a277180f89..e047b89d9267 100644
--- a/layout/reftests/svg/smil/anim-filter-size-01.svg
+++ b/layout/reftests/svg/smil/anim-filter-size-01.svg
@@ -6,8 +6,7 @@
   <script>
 
 window.addEventListener("MozReftestInvalidate", run, false);
-
-setTimeout(run, 3000); // for non-gecko
+setTimeout(run, 4000); // fallback for running outside reftest
 
 function run() {
   setTimeAndSnapshot(1, true)
diff --git a/layout/reftests/svg/smil/anim-view-01.svg b/layout/reftests/svg/smil/anim-view-01.svg
index 397377ccfa9d..b6730263a7c0 100644
--- a/layout/reftests/svg/smil/anim-view-01.svg
+++ b/layout/reftests/svg/smil/anim-view-01.svg
@@ -12,8 +12,7 @@
   <script xlink:href="smil-util.js" type="text/javascript"/>
   <script>
     window.addEventListener("MozReftestInvalidate", run, false);
-
-    setTimeout(run, 3000); // for non-gecko
+    setTimeout(run, 4000); // fallback for running outside reftest
 
     function run() {
       setTimeAndSnapshot(101, true);
diff --git a/layout/reftests/svg/smil/event/event-seek-1.svg b/layout/reftests/svg/smil/event/event-seek-1.svg
index 1c143ce9e0bc..727c244c6c94 100644
--- a/layout/reftests/svg/smil/event/event-seek-1.svg
+++ b/layout/reftests/svg/smil/event/event-seek-1.svg
@@ -2,8 +2,7 @@
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
      id="svg"
-     class="reftest-wait"
-     onload="window.setTimeout(seek, 10)">
+     class="reftest-wait">
   <script xlink:href="event-util.js" type="text/javascript"/>
   <script type="text/javascript">
     function seek()
@@ -11,6 +10,8 @@
       document.documentElement.setCurrentTime(40);
       finish(30);
     }
+    document.addEventListener("MozReftestInvalidate", seek, false);
+    setTimeout(seek, 4000); // fallback for running outside reftest
   </script>
   <rect width="100" height="100" fill="red">
     <set attributeName="fill" attributeType="CSS" to="green"
diff --git a/layout/reftests/svg/smil/event/event-target-non-svg-1.xhtml b/layout/reftests/svg/smil/event/event-target-non-svg-1.xhtml
index 6ad1874e2ad0..d57948d6c39a 100644
--- a/layout/reftests/svg/smil/event/event-target-non-svg-1.xhtml
+++ b/layout/reftests/svg/smil/event/event-target-non-svg-1.xhtml
@@ -23,9 +23,13 @@ function doSnapshot() {
   svg.setCurrentTime(2);
   document.documentElement.removeAttribute("class");
 }
+
+document.addEventListener("MozReftestInvalidate", snapshot, false);
+setTimeout(snapshot, 4000); // fallback for running outside reftest
+
 </script>
 </head>
-<body onload="snapshot()">
+<body>
 <a href="#" id="a">Play!</a>
 <svg xmlns="http://www.w3.org/2000/svg" width="120px" height="120px" id="svg">
   <rect width="100" height="100" fill="red">
diff --git a/layout/reftests/svg/smil/sort/sort-startSame-1b.svg b/layout/reftests/svg/smil/sort/sort-startSame-1b.svg
index e49ad6a757af..7e99e508654e 100644
--- a/layout/reftests/svg/smil/sort/sort-startSame-1b.svg
+++ b/layout/reftests/svg/smil/sort/sort-startSame-1b.svg
@@ -2,8 +2,7 @@
      positions, the one that ends up later in the document should win. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     class="reftest-wait"
-     onload="setTimeout('go()', 0)">
+     class="reftest-wait">
   <script xlink:href="../smil-util.js" type="text/javascript"/>
 
   <script><![CDATA[
@@ -17,6 +16,8 @@
 
       setTimeAndSnapshot(1.0, true)
     }
+    document.addEventListener("MozReftestInvalidate", go, false);
+    setTimeout(go, 4000); // fallback for running outside reftest
   ]]></script>     
 
   <rect x="0" y="0" width="100" height="100" fill="blue">
diff --git a/layout/reftests/svg/smil/syncbase/cross-container-3.xhtml b/layout/reftests/svg/smil/syncbase/cross-container-3.xhtml
index 9c41142d29a5..d5e94ac12e35 100644
--- a/layout/reftests/svg/smil/syncbase/cross-container-3.xhtml
+++ b/layout/reftests/svg/smil/syncbase/cross-container-3.xhtml
@@ -42,9 +42,13 @@ function snapshotB() {
   svga.setCurrentTime(svga.getCurrentTime());
   document.documentElement.removeAttribute("class");
 }
+
+document.addEventListener("MozReftestInvalidate", snapshot, false);
+setTimeout(snapshot, 4000); // fallback for running outside reftest
+
 </script>
 </head>
-<body onload="snapshot()">
+<body>
 <svg xmlns="http://www.w3.org/2000/svg" width="120px" height="120px" id="svg-a">
   <rect width="100" height="100" fill="orange">
     <animate attributeName="fill" attributeType="CSS" id="a"
diff --git a/layout/reftests/svg/smil/timed/appendChild-1a.svg b/layout/reftests/svg/smil/timed/appendChild-1a.svg
index b57703c64afa..4d740087c123 100644
--- a/layout/reftests/svg/smil/timed/appendChild-1a.svg
+++ b/layout/reftests/svg/smil/timed/appendChild-1a.svg
@@ -3,9 +3,7 @@
      then wait a little, and make sure the animation is frozen there. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1100);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       var rect1 = document.getElementById("rect1");
@@ -16,6 +14,11 @@
       // Wait >= 1s before taking screenshot, to give animation time to finish
       setTimeout('document.documentElement.removeAttribute("class")', 1100);
     }
+    function delay_go() {
+      setTimeout(go, 1100);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect id="rect1" y="40" width="10" height="10" fill="blue">
     <animate id="anim" attributeName="x" 
diff --git a/layout/reftests/svg/smil/timed/appendChild-1b.svg b/layout/reftests/svg/smil/timed/appendChild-1b.svg
index 6cf6faa0a3de..cedf58a8f682 100644
--- a/layout/reftests/svg/smil/timed/appendChild-1b.svg
+++ b/layout/reftests/svg/smil/timed/appendChild-1b.svg
@@ -2,9 +2,7 @@
      focus just on the second rect. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1100);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       var rect1 = document.getElementById("rect1");
@@ -15,6 +13,11 @@
       // Wait >= 1s before taking screenshot, to give animation time to finish
       setTimeout('document.documentElement.removeAttribute("class")', 1100);
     }
+    function delay_go() {
+      setTimeout(go, 1100);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect id="rect1" y="40" width="10" height="10" fill="white">
     <animate id="anim" attributeName="x" 
diff --git a/layout/reftests/svg/smil/timed/appendChild-2a.svg b/layout/reftests/svg/smil/timed/appendChild-2a.svg
index f8d5449dfc5b..19d7c85b8df2 100644
--- a/layout/reftests/svg/smil/timed/appendChild-2a.svg
+++ b/layout/reftests/svg/smil/timed/appendChild-2a.svg
@@ -3,9 +3,7 @@
      then wait a little, and make sure the animation is frozen there. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1100);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       var rect1 = document.getElementById("rect1");
@@ -16,6 +14,11 @@
       // Wait >= 1s before taking screenshot, to give animation time to finish
       setTimeout('document.documentElement.removeAttribute("class")', 1100);
     }
+    function delay_go() {
+      setTimeout(go, 1100);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect id="rect1" y="40" width="10" height="10" fill="blue">
     <animate id="anim" attributeName="x" 
diff --git a/layout/reftests/svg/smil/timed/appendChild-2b.svg b/layout/reftests/svg/smil/timed/appendChild-2b.svg
index 034e18d4d744..f8b772bd56f5 100644
--- a/layout/reftests/svg/smil/timed/appendChild-2b.svg
+++ b/layout/reftests/svg/smil/timed/appendChild-2b.svg
@@ -2,9 +2,7 @@
      focus just on the second rect. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1100);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       var rect1 = document.getElementById("rect1");
@@ -15,6 +13,11 @@
       // Wait >= 1s before taking screenshot, to give animation time to finish
       setTimeout('document.documentElement.removeAttribute("class")', 1100);
     }
+    function delay_go() {
+      setTimeout(go, 1100);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect id="rect1" y="40" width="10" height="10" fill="white">
     <animate id="anim" attributeName="x" 
diff --git a/layout/reftests/svg/smil/timed/paced-1.svg b/layout/reftests/svg/smil/timed/paced-1.svg
index ce52b7fb001b..0416e0eace74 100644
--- a/layout/reftests/svg/smil/timed/paced-1.svg
+++ b/layout/reftests/svg/smil/timed/paced-1.svg
@@ -2,13 +2,16 @@
      despite the many small-jump values before it, leaving the canvas blank. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1000);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       document.documentElement.removeAttribute("class");
     }
+    function delay_go() {
+      setTimeout(go, 1000);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect height="90" width="90" fill="green"></rect>
   <rect x="40" y="40" width="10" height="10" fill="red">
diff --git a/layout/reftests/svg/smil/timed/pause-1.svg b/layout/reftests/svg/smil/timed/pause-1.svg
index f81becae640a..36101cadf042 100644
--- a/layout/reftests/svg/smil/timed/pause-1.svg
+++ b/layout/reftests/svg/smil/timed/pause-1.svg
@@ -3,9 +3,7 @@
      a little, and make sure the animation is frozen there.       -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1100);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       // Use try/catch, so that we make sure to remove the reftest-wait 
@@ -26,6 +24,11 @@
       // jump to next value if the freeze didn't work.
       setTimeout('document.documentElement.removeAttribute("class")', 600);
     }
+    function delay_go() {
+      setTimeout(go, 1100);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect y="40" width="10" height="10" fill="blue">
     <animate id="rect" attributeName="x" 
diff --git a/layout/reftests/svg/smil/timed/removeChild-1.svg b/layout/reftests/svg/smil/timed/removeChild-1.svg
index 64b9d358dbc7..905373d710b1 100644
--- a/layout/reftests/svg/smil/timed/removeChild-1.svg
+++ b/layout/reftests/svg/smil/timed/removeChild-1.svg
@@ -3,9 +3,7 @@
      time, and see what happens. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1100);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       var rect1 = document.getElementById("rect1");
@@ -16,6 +14,11 @@
       // finish, if it's still going
       setTimeout('document.documentElement.removeAttribute("class")', 700);
     }
+    function delay_go() {
+      setTimeout(go, 1100);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect id="rect1" y="40" width="10" height="10" fill="blue">
     <animate id="anim" attributeName="x" 
diff --git a/layout/reftests/svg/smil/timed/removeChild-2.svg b/layout/reftests/svg/smil/timed/removeChild-2.svg
index ca7bd821bf3d..ba07abc2af53 100644
--- a/layout/reftests/svg/smil/timed/removeChild-2.svg
+++ b/layout/reftests/svg/smil/timed/removeChild-2.svg
@@ -3,9 +3,7 @@
      time, and see what happens. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     onload="setTimeout('go()', 1100);"
-     class="reftest-wait"
->
+     class="reftest-wait">
   <script>
     function go() {
       var rect1 = document.getElementById("rect1");
@@ -16,6 +14,11 @@
       // finish, if it's still going
       setTimeout('document.documentElement.removeAttribute("class")', 700);
     }
+    function delay_go() {
+      setTimeout(go, 1100);
+    }
+    document.addEventListener("MozReftestInvalidate", delay_go, false);
+    setTimeout(delay_go, 4000); // fallback for running outside reftest
   </script>
   <rect id="rect1" y="40" width="10" height="10" fill="blue">
     <animate id="anim" attributeName="x" 
diff --git a/layout/reftests/svg/suspend-02.svg b/layout/reftests/svg/suspend-02.svg
index 1084e762eb1e..a9f7ced9c4fe 100644
--- a/layout/reftests/svg/suspend-02.svg
+++ b/layout/reftests/svg/suspend-02.svg
@@ -11,8 +11,7 @@
     <![CDATA[
 
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
       var svg = document.documentElement;
diff --git a/layout/reftests/svg/suspend-04.svg b/layout/reftests/svg/suspend-04.svg
index 79c351fb2c46..5ab4b7f249b0 100644
--- a/layout/reftests/svg/suspend-04.svg
+++ b/layout/reftests/svg/suspend-04.svg
@@ -11,8 +11,7 @@
     <![CDATA[
 
     document.addEventListener("MozReftestInvalidate", doTest, false);
-    // in case we're not gecko
-    setTimeout(doTest, 5000);
+    setTimeout(doTest, 4000); // fallback for running outside reftest
 
     function doTest() {
       var svg = document.documentElement;