Bug 648244: Infinite loop on tabs.onActivate if accessing windows.act…

…iveWindow (new window) r+a=myk

packages/addon-kit/lib/windows.js

@@ -83,6 +83,10 @@ const BrowserWindowTrait = Trait.compose(
      * @param {nsIWindow} window
      */
     constructor: function BrowserWindow(options) {
+      // Register this window ASAP, in order to avoid loop that would try
+      // to create this window instance over and over (see bug 648244)
+      windows.push(this);
+
       // make sure we don't have unhandled errors
       this.on('error', console.exception.bind(console));
 
@@ -145,7 +149,6 @@ function BrowserWindow(options) {
       return window._public
   }
   let window = BrowserWindowTrait(options);
-  windows.push(window);
   return window._public;
 }
 // to have proper `instanceof` behavior will go away when #596248 is fixed.

packages/addon-kit/tests/test-tabs.js

@@ -59,6 +59,27 @@ exports.testActiveTab_getter = function(test) {
   });
 };
 
+// test 'BrowserWindow' instance creation on tab 'activate' event
+// See bug 648244: there was a infinite loop.
+exports.testBrowserWindowCreationOnActivate = function(test) {
+  test.waitUntilDone();
+
+  let windows = require("windows").browserWindows;
+  let tabs = require("tabs");
+
+  let gotActivate = false;
+
+  tabs.on('activate', function onActivate(eventTab) {
+    test.assert(windows.activeWindow, "Is able to fetch activeWindow");
+    gotActivate = true;
+  });
+
+  openBrowserWindow(function(window, browser) {
+    test.assert(gotActivate, "Received activate event before openBrowserWindow's callback is called");
+    closeBrowserWindow(window, function () test.done());
+  });
+}
+
 // test tab.activeTab setter
 exports.testActiveTab_setter = function(test) {
   test.waitUntilDone();