Issue 443 - Fix blocking pop-ups after redirect

lib/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 533 matching lines @@
       {
         newLocation = newChannel.URI;
       } catch(e2) {}
       if (!newLocation)
         return;
 
       let wnd = Utils.getRequestWindow(newChannel);
       if (!wnd)
         return;
 
-      if (contentType == Policy.type.POPUP && wnd.opener)
+      if (contentType == Ci.nsIContentPolicy.TYPE_DOCUMENT)

[Wladimir Palant, 2015/10/26 20:50:26]

This relies on the changes from https://codereview.adblockplus.org/29329409/,
before these changes the type here would be TYPE_POPUP rather than
TYPE_DOCUMENT.

       {
-        // Popups are initiated by their opener, not their own window.
-        wnd = wnd.opener;
+        if (wnd.history.length <= 1 && wnd.opener)
+        {
+          // Special treatment for pop-up windows
+          this.observe(wnd, "content-document-global-created", null, newLocation);
+        }
+        return;
       }
 
       if (!Policy.processNode(wnd, wnd.document, contentType, newLocation, false))
         result = Cr.NS_BINDING_ABORTED;
     }
     catch (e)
     {
       // We shouldn't throw exceptions here - this will prevent the redirect.
       Cu.reportError(e);
     }
@@ skipping 201 matching lines @@
   if (!wnd || wnd.closed)
     return;
 
   if (entry.type == Policy.type.OBJECT)
   {
     node.removeEventListener("mouseover", objectMouseEventHander, true);
     node.removeEventListener("mouseout", objectMouseEventHander, true);
   }
   Policy.processNode(wnd, node, entry.type, Utils.makeURI(entry.location), true);
 }