From 0e9062adbb20ff1d425a8a441420377ecd4a8340 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 23 Sep 2009 11:42:59 +0200
Subject: [PATCH] Attempt intermittent orange fix. Bug 518274. reftest:
 dynamic--inline-resize-window-width.xhtml intermittently fails.

---
 .../sizing/dynamic--inline-resize-window-height.xhtml  | 10 ++++++++--
 .../sizing/dynamic--inline-resize-window-width.xhtml   | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/layout/reftests/svg/sizing/dynamic--inline-resize-window-height.xhtml b/layout/reftests/svg/sizing/dynamic--inline-resize-window-height.xhtml
index 88cda311299a..7ea9351c5e71 100644
--- a/layout/reftests/svg/sizing/dynamic--inline-resize-window-height.xhtml
+++ b/layout/reftests/svg/sizing/dynamic--inline-resize-window-height.xhtml
@@ -33,12 +33,18 @@ var initial_height = top.innerHeight;
 
 function restore_height()
 {
+  document.removeEventListener("MozReftestInvalidate", restore_height, false);
+  document.addEventListener("MozReftestInvalidate", finish_test, false);
   top.innerHeight = initial_height;
-  setTimeout(function() { document.documentElement.removeAttribute('class'); }, 0);
 }
 
-top.innerHeight /= 2;
+function finish_test()
+{
+  document.documentElement.removeAttribute('class');
+}
+
 document.addEventListener("MozReftestInvalidate", restore_height, false);
+top.innerHeight /= 2;
 
     </script>
   </head>
diff --git a/layout/reftests/svg/sizing/dynamic--inline-resize-window-width.xhtml b/layout/reftests/svg/sizing/dynamic--inline-resize-window-width.xhtml
index 18a1eb2473c6..8870a06f8beb 100644
--- a/layout/reftests/svg/sizing/dynamic--inline-resize-window-width.xhtml
+++ b/layout/reftests/svg/sizing/dynamic--inline-resize-window-width.xhtml
@@ -33,12 +33,18 @@ var initial_width = top.innerWidth;
 
 function restore_width()
 {
+  document.removeEventListener("MozReftestInvalidate", restore_width, false);
+  document.addEventListener("MozReftestInvalidate", finish_test, false);
   top.innerWidth = initial_width;
-  setTimeout(function() { document.documentElement.removeAttribute('class'); }, 0);
 }
 
-top.innerWidth /= 2;
+function finish_test()
+{
+  document.documentElement.removeAttribute('class');
+}
+
 document.addEventListener("MozReftestInvalidate", restore_width, false);
+top.innerWidth /= 2;
 
     </script>
   </head>