Issue 3208 - Don`t keep track of content policy for redirects, Gecko will do that for us

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 447 matching lines @@
         let uri = additional || Utils.makeURI(subject.location.href);
         if (!Policy.processNode(subject.opener, subject.opener.document, Policy.type.POPUP, uri, false))
         {
           subject.stop();
           Utils.runAsync(() => subject.close());
         }
         else if (uri.spec == "about:blank")
         {
           // An about:blank pop-up most likely means that a load will be
           // initiated asynchronously. Wait for that.
-          Utils.runAsync(function()
+          Utils.runAsync(() =>
           {
             let channel = subject.QueryInterface(Ci.nsIInterfaceRequestor)
                                  .getInterface(Ci.nsIDocShell)
                                  .QueryInterface(Ci.nsIDocumentLoader)
                                  .documentChannel;
             if (channel)
               this.observe(subject, topic, data, channel.URI);
           });
         }
         break;
       }
     }
   },
 
   //
   // nsIChannelEventSink interface implementation
   //
 
   asyncOnChannelRedirect: function(oldChannel, newChannel, flags, callback)
   {
     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;

[tschuster, 2015/10/29 14:02:03]

I would prefer an explicit `"externalContentPolicyType" in loadInfo` check.
(There is no bug at the moment, because 0 = Invalid)

[Wladimir Palant, 2015/10/29 18:22:47]

Done.

+      let contentType = ("externalContentPolicyType" in loadInfo ?
+          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 == Ci.nsIContentPolicy.TYPE_DOCUMENT)
-      {
-        if (wnd.history.length <= 1 && wnd.opener)
-        {
-          // Special treatment for pop-up windows
-          this.observe(wnd, "content-document-global-created", null, newLocation);
-        }
-        return;
+      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);
     }
@@ 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);
 }