Fixed: WindowObserver ignoring primary browser window if instantiated before window visible

lib/windowObserver.js

 /*
  * This file is part of the Adblock Plus build tools,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 19 matching lines @@
  *                          and "end" (default) means to wait until the "load" event.
  * @constructor
  */
 function WindowObserver(listener, when)
 {
   this._listener  = listener;
   this._when = when;
 
   let windows = [];
   let e = Services.wm.getZOrderDOMWindowEnumerator(null, true);
-  if (!e.hasMoreElements())
-  {
-    // On Linux the list returned will be empty, see bug 156333. Fall back to random order.
-    e = Services.wm.getEnumerator(null);
-  }

[Wladimir Palant, 2013/09/11 11:31:26]

I think we can drop the fallback here, ww.getWindowEnumerator() should give us
the same result as wm.getEnumerator(null).

   while (e.hasMoreElements())
-  {
-    let element = e.getNext();
-    this._addWindowListener(element);
-    windows.push(element);
-  }
+    windows.push(e.getNext());
 
-  // Check if there are any windows that we missed because they are not visible yet
+  // Check if there are any windows that we missed
   let eAll = Services.ww.getWindowEnumerator();
   while (eAll.hasMoreElements())
   {
     let element = eAll.getNext();
     if (windows.indexOf(element) < 0)
-      this._addWindowListener(element);

[Wladimir Palant, 2013/09/11 11:31:26]

I'd rather have windows.push(element) here - simply go through the windows in
our list at the end of the function instead of introducing an
_addWindowListener() method.

+      windows.push(element);
+  }
+  
+  for (let i = 0; i < windows.length; i++)
+  {
+    let window = windows[i].QueryInterface(Ci.nsIDOMWindow);
+    if (when == "start" || window.document.readyState == "complete")
+      this._listener.applyToWindow(window);
+    else
+      this.observe(window, "chrome-document-global-created", null);
   }
 
   Services.obs.addObserver(this, "chrome-document-global-created", true);
 
   this._shutdownHandler = function()
   {
     let e = Services.ww.getWindowEnumerator();
     while (e.hasMoreElements())
       this._listener.removeFromWindow(e.getNext().QueryInterface(Ci.nsIDOMWindow));
 
     Services.obs.removeObserver(this, "chrome-document-global-created");
   }.bind(this);
   onShutdown.add(this._shutdownHandler);
 }
 WindowObserver.prototype =
 {
   _listener: null,
   _when: null,
   _shutdownHandler: null,
-
-  _addWindowListener: function(e)
-  {
-    let window = e.QueryInterface(Ci.nsIDOMWindow);
-    if (this._when == "start" || window.document.readyState == "complete")
-      this._listener.applyToWindow(window);
-    else
-      this.observe(window, "chrome-document-global-created", null);
-  },
 
   shutdown: function()
   {
     if (!this._shutdownHandler)
       return;
 
     onShutdown.remove(this._shutdownHandler);
     this._shutdownHandler();
     this._shutdownHandler = null;
   },
@@ skipping 15 matching lines @@
         window.removeEventListener(event, listener, false);
         if (this._shutdownHandler)
           this._listener.applyToWindow(window);
       }.bind(this);
       window.addEventListener(event, listener, false);
     }
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver])
 };