Issue 4335 - Adblock Plus should forget pop-ups after the initial load

lib/child/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 294 matching lines @@
 
   shouldProcess: function(contentType, contentLocation, requestOrigin, insecNode, mimeType, extra)
   {
     return Ci.nsIContentPolicy.ACCEPT;
   },
 
   //
   // nsIObserver interface implementation
   //
   _openers: new WeakMap(),
-  _alreadyLoaded: {},
+  _alreadyLoaded: Symbol(),
 
   observe: function(subject, topic, data, uri)
   {
     switch (topic)
     {
       case "document-element-inserted":
       {
         let window = subject.defaultView;
         if (!window)
           return;
@@ skipping 85 matching lines @@
         return;
 
       if (contentType == Ci.nsIContentPolicy.TYPE_DOCUMENT)
       {
         if (wnd.history.length <= 1 && wnd.opener)
         {
           // Special treatment for pop-up windows - this will close the window
           // rather than preventing the redirect. 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, "document-element-inserted", null, oldChannel.URI.spec);
-          this.observe(wnd, "document-element-inserted", null, newChannel.URI.spec);
+          this.observe(wnd.document, "document-element-inserted", null, oldChannel.URI.spec);
+          this.observe(wnd.document, "document-element-inserted", null, newChannel.URI.spec);
         }
         return;
       }
 
       shouldAllowAsync(wnd, wnd.document, types.get(contentType), newChannel.URI.spec, function(allow)
       {
         callback.onRedirectVerifyCallback(allow ? Cr.NS_OK : Cr.NS_BINDING_ABORTED);
       });
       async = true;
     }
@@ skipping 76 matching lines @@
           let weights = parentNode[property].split(",");
           weights[index] = "0";
           parentNode[property] = weights.join(",");
         }
       }
       else
         node.classList.add(cls);
     }
   });
 }