Issue 341 - Pop-up blocking fails if the pop-up URL redirects

lib/contentPolicy.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 496 matching lines @@
           // We just handled a content policy call for this request - associate
           // the data with the channel so that we can find it in case of a redirect.
           subject.setProperty("abpRequestType", this.previousRequest[1]);
           this.previousRequest = null;
         }
 
         if (this.expectingPopupLoad)
         {
           let wnd = Utils.getRequestWindow(subject);
           if (wnd && wnd.opener && wnd.location.href == "about:blank")
+          {
             this.observe(wnd, "content-document-global-created", null, subject.URI);
+            if (subject instanceof Ci.nsIWritablePropertyBag)
+              subject.setProperty("abpRequestType", Policy.type.POPUP);
+          }
         }
 
         break;
       }
       case "xpcom-category-entry-removed":
       case "xpcom-category-cleared":
       {
         let category = data;
         if (this.xpcom_categories.indexOf(category) < 0)
           return;
@@ skipping 49 matching lines @@
       if (!wnd)
         return;
 
       if (contentType == Policy.type.SUBDOCUMENT && wnd.parent == wnd.top && wnd.opener)
       {
         // This is a window opened in a new tab miscategorized as frame load,
         // see bug 467514. Get the frame as context to be at least consistent.
         wnd = wnd.opener;
       }
 
+      if (contentType == Policy.type.POPUP && wnd.opener)
+      {
+        // Popups are initiated by their opener, not their own window.
+        wnd = wnd.opener;
+      }
+
       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);
     }
     finally
     {
@@ skipping 158 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);
 }