From 26993a50be91126df0aa34b21d7a64955c9df717 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Wed, 11 Jul 2012 12:21:50 +0900
Subject: [PATCH] Bug 707733 - Extend timeout for deferred-anim-1.xhtml;
 r=dholbert

---
 .../smil/container/deferred-anim-1-ref.xhtml  |  5 +--
 .../svg/smil/container/deferred-anim-1.xhtml  | 41 ++++++++++++++-----
 .../smil/container/deferred-tree-1-ref.xhtml  |  3 +-
 .../svg/smil/container/deferred-tree-1.xhtml  |  4 ++
 4 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/layout/reftests/svg/smil/container/deferred-anim-1-ref.xhtml b/layout/reftests/svg/smil/container/deferred-anim-1-ref.xhtml
index daca3f2d18bb..ea59e77c8d96 100644
--- a/layout/reftests/svg/smil/container/deferred-anim-1-ref.xhtml
+++ b/layout/reftests/svg/smil/container/deferred-anim-1-ref.xhtml
@@ -6,10 +6,7 @@
 
   <body>
     <svg xmlns="http://www.w3.org/2000/svg" width="200px" height="200px">
-      <rect x="1" y="1" width="198" height="198"
-        style="fill: none; stroke: black"/>
-      <rect x="90" y="80" width="40" height="40" fill="royalblue"
-        stroke="black" stroke-width="1" id="target"/>
+      <rect width="199" height="199" fill="green"/>
     </svg>
   </body>
 </html>
diff --git a/layout/reftests/svg/smil/container/deferred-anim-1.xhtml b/layout/reftests/svg/smil/container/deferred-anim-1.xhtml
index 1b0dce83e17b..362a99039d03 100644
--- a/layout/reftests/svg/smil/container/deferred-anim-1.xhtml
+++ b/layout/reftests/svg/smil/container/deferred-anim-1.xhtml
@@ -14,22 +14,46 @@
     EXPECTED RESULTS: The box begins moving from the center.
     -->
     <script>
+        var timeoutID;
+
         function animate()
         {
-          var svg = document.getElementsByTagName('svg')[0];
           addAnimation();
-          setTimeout('document.documentElement.removeAttribute("class")', 150);
+          var svg = document.getElementsByTagName('svg')[0];
+          var anim = svg.getElementsByTagName('animate')[0];
+          // We should pass quickly and fail slowly.
+          // In the pass case, we'll get an end event almost immediately.
+          // In the failure case, wait 30s before giving up.
+          timeoutID = window.setTimeout(giveUp, 30000);
+          anim.addEventListener('end', finish, true);
+        }
+
+        function giveUp() {
+          var svg = document.getElementsByTagName('svg')[0];
+          var rect = svg.getElementsByTagName('rect')[0];
+          rect.setAttribute("fill", "red");
+          var anim = svg.getElementsByTagName('animate')[0];
+          anim.parentNode.removeChild(anim);
+          timeoutID = null;
+          finish();
+        }
+
+        function finish() {
+          if (timeoutID) {
+            window.clearTimeout(timeoutID);
+            timeoutID = null;
+          }
+          document.documentElement.removeAttribute('class');
         }
 
         function addAnimation()
         {
           const svgns="http://www.w3.org/2000/svg";
           var anim = document.createElementNS(svgns,'animate');
-          anim.setAttribute('attributeName','x');
-          anim.setAttribute('from','0');
-          anim.setAttribute('to','90');
+          anim.setAttribute('attributeName','fill');
+          anim.setAttribute('to','green');
           anim.setAttribute('begin','0s');
-          anim.setAttribute('dur','0.01s');
+          anim.setAttribute('dur','0.001s');
           anim.setAttribute('fill','freeze');
           var target = document.getElementById('target');
           target.appendChild(anim);
@@ -39,10 +63,7 @@
 
   <body onload="animate()">
     <svg xmlns="http://www.w3.org/2000/svg" width="200px" height="200px">
-      <rect x="1" y="1" width="198" height="198"
-        style="fill: none; stroke: black"/>
-      <rect x="-20" y="80" width="40" height="40" fill="royalblue"
-        stroke="black" stroke-width="1" id="target"/>
+      <rect width="199" height="199" fill="red" id="target"/>
     </svg>
   </body>
 </html>
diff --git a/layout/reftests/svg/smil/container/deferred-tree-1-ref.xhtml b/layout/reftests/svg/smil/container/deferred-tree-1-ref.xhtml
index d7458cf53ada..e70151c7ccb4 100644
--- a/layout/reftests/svg/smil/container/deferred-tree-1-ref.xhtml
+++ b/layout/reftests/svg/smil/container/deferred-tree-1-ref.xhtml
@@ -5,10 +5,11 @@
   </head>
 
   <body>
-    <p id="tree-container"/>
+    <p id="tree-container">
       <svg xmlns="http://www.w3.org/2000/svg" width="200px" height="200px"
         id="created-svg">
         <rect x="0" y="0" width="199" height="199" fill="green"/>
       </svg>
+    </p>
   </body>
 </html>
diff --git a/layout/reftests/svg/smil/container/deferred-tree-1.xhtml b/layout/reftests/svg/smil/container/deferred-tree-1.xhtml
index da56a65273c1..6d671331ecaa 100644
--- a/layout/reftests/svg/smil/container/deferred-tree-1.xhtml
+++ b/layout/reftests/svg/smil/container/deferred-tree-1.xhtml
@@ -38,6 +38,10 @@
           // will mean every test run is taking 30s longer than it should and
           // we'd like to know about that so we'll make it a failure.
           rect.setAttribute("fill", "red");
+          // We'll need to clear the animation for this to take effect
+          var anim = svg.getElementsByTagName('animate')[0];
+          anim.parentNode.removeChild(anim);
+          timeoutID = null;
           finish();
         }
 
