Issue 3208 - Separate contentPolicy module into a parent and child part

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 58 matching lines @@
   init: function()
   {
     // whitelisted URL schemes
     for (let scheme of Prefs.whitelistschemes.toLowerCase().split(" "))
       this.whitelistSchemes.add(scheme);
 
     let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
                            .getService(Ci.nsIMessageListenerManager)
                            .QueryInterface(Ci.nsIMessageBroadcaster);
     let handler = (message => this.shouldAllow(message.data));
     messageManager.addMessageListener("AdblockPlus:ShouldAllow", handler);

[tschuster, 2015/11/12 14:04:17]

nit: The surrounding brackets are unnecessary.

[Wladimir Palant, 2015/11/12 15:16:31]

This code is going to be replaced in
https://codereview.adblockplus.org/29329742/ anyway, no unnecessary brackets
there. So I rather don't do the rebasing dance for this one again.

     onShutdown.add(() => messageManager.removeMessageListener("AdblockPlus:ShouldAllow", handler));
 
     // Generate class identifier used to collapse nodes and register
     // corresponding stylesheet.
     let collapsedClass = "";
     let offset = "a".charCodeAt(0);
     for (let i = 0; i < 20; i++)
       collapsedClass +=  String.fromCharCode(offset + Math.random() * 26);
 
     let handler2 = () => collapsedClass;
@@ skipping 10 matching lines @@
     });
   },
 
   /**
    * Checks whether a node should be blocked, hides it if necessary
    * @param {Object} data  request data
    * @param {String} data.contentType
    * @param {String} data.location
    * @param {Object[]} data.frames
    * @param {Boolean} data.isPrivate  true if the request belongs to a private browsing window
-   * @return {Object} An object containing properties block, collapse and hits

[tschuster, 2015/11/12 14:04:17]

I think s/block/allow

[Wladimir Palant, 2015/11/12 15:16:31]

Right, fixed.

+   * @return {Object} An object containing properties allow, collapse and hits
    *                  indicating how this request should be handled.
    */
   shouldAllow: function({contentType, location, frames, isPrivate})
   {
     let hits = [];
 
     function addHit(frameIndex, contentType, docDomain, thirdParty, location, filter)
     {
       if (filter && !isPrivate)
         FilterStorage.increaseHitCount(filter);
@@ skipping 286 matching lines @@
   if (!wnd || wnd.closed)
     return;
 
   if (entry.type == "OBJECT")
   {
     node.removeEventListener("mouseover", objectMouseEventHander, true);
     node.removeEventListener("mouseout", objectMouseEventHander, true);
   }
   Policy.processNode(wnd, node, entry.type, entry.location, true);
 }