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 478 matching lines @@
     let result = Cr.NS_OK;
     try
     {
       // nsILoadInfo.contentPolicyType was introduced in Gecko 35, then
       // renamed to nsILoadInfo.externalContentPolicyType in Gecko 44.
       let loadInfo = oldChannel.loadInfo;
       let contentType = loadInfo.externalContentPolicyType || loadInfo.contentPolicyType;
       if (!contentType)
         return;
 
-      let newLocation = null;
-      try
-      {
-        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)
       {
-        // 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. Note that we might not have
+          // seen the original channel yet because the redirect happened before
+          // the async code in observe() had a chance to run.
+          this.observe(wnd, "content-document-global-created", null, oldChannel.URI);
+          this.observe(wnd, "content-document-global-created", null, newChannel.URI);
+        }

[tschuster, 2015/11/05 15:27:18]

I think your comment about this patch set would help here.
// The normal code below will merely prevent the redirect, not close the pop-up.

[Wladimir Palant, 2015/11/05 15:51:59]

Done.

+        return;
       }
 
-      if (!Policy.processNode(wnd, wnd.document, contentType, newLocation, false))
+      if (!Policy.processNode(wnd, wnd.document, contentType, newChannel.URI, false))
         result = Cr.NS_BINDING_ABORTED;
     }
     catch (e)
     {
       // We shouldn't throw exceptions here - this will prevent the redirect.
       Cu.reportError(e);
     }
     finally
     {
       callback.onRedirectVerifyCallback(result);
@@ skipping 198 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);
 }