From 7740e246cfb0fbedb78e7843215977ca9ac50034 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Thu, 7 May 2015 20:27:52 +0200
Subject: [PATCH] Bug 961215 - Fix intermittent browser_tabview_bug625269.js
 failures by taking into account that window.resizeTo() can fail to change the
 window size sometimes r=MattN

---
 .../tabview/test/browser_tabview_bug625269.js     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/browser/components/tabview/test/browser_tabview_bug625269.js b/browser/components/tabview/test/browser_tabview_bug625269.js
index 08a0636bbd8..47cc3c016df 100644
--- a/browser/components/tabview/test/browser_tabview_bug625269.js
+++ b/browser/components/tabview/test/browser_tabview_bug625269.js
@@ -66,11 +66,16 @@ function resizeWindow(win, diffX, diffY, callback) {
 
   (function tryResize() {
     let {outerWidth: width, outerHeight: height} = win;
-    if (width != targetWidth || height != targetHeight) {
-      win.resizeTo(targetWidth, targetHeight);
-      executeSoon(tryResize);
-    } else {
-      callback();
+    if (width == targetWidth && height == targetHeight) {
+      executeSoon(callback);
+      return;
     }
+
+    win.addEventListener("resize", function onResize() {
+      win.removeEventListener("resize", onResize);
+      executeSoon(tryResize);
+    });
+
+    win.resizeTo(targetWidth, targetHeight);
   })();
 }