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 15 matching lines @@
 
 let {Utils} = require("utils");
 let {Prefs} = require("prefs");
 let {FilterStorage} = require("filterStorage");
 let {BlockingFilter, WhitelistFilter, RegExpFilter} = require("filterClasses");
 let {defaultMatcher} = require("matcher");
 let {objectMouseEventHander} = require("objectTabs");
 let {ElemHide} = require("elemHide");
 
 /**
- * Randomly generated class name, to be applied to collapsed nodes.
- */
-let collapsedClass = "";
-
-/**
  * Public policy checking functions and auxiliary objects
  * @class
  */
 var Policy = exports.Policy =
 {
   /**
    * Set of explicitly supported content types
    * @type Set
    */
   contentTypes: new Set([
@@ skipping 22 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 => JSON.stringify(this.shouldAllow(message.data)));
+    let handler = (message => this.shouldAllow(message.data));
     messageManager.addMessageListener("AdblockPlus:ShouldAllow", handler);
     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;
     messageManager.addMessageListener("AdblockPlus:GetCollapsedClass", handler2);
     onShutdown.add(() => messageManager.removeMessageListener("AdblockPlus:GetCollapsedClass", handler2));
-
-    // Generate class identifier used to collapse node and register corresponding
-    // stylesheet.
-    let offset = "a".charCodeAt(0);
-    for (let i = 0; i < 20; i++)
-      collapsedClass +=  String.fromCharCode(offset + Math.random() * 26);
 
     let collapseStyle = Services.io.newURI("data:text/css," +
         encodeURIComponent("." + collapsedClass +
         "{-moz-binding: url(chrome://global/content/bindings/general.xml#foobarbazdummy) !important;}"), null, null);
     Utils.styleService.loadAndRegisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET);
     onShutdown.add(() =>
     {
       Utils.styleService.unregisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET);
     });
   },
 
   /**
    * Checks whether a node should be blocked, hides it if necessary
-   * @param contentType {String}
-   * @param location {String}
-   * @param fremes {Object[]}
-   * @param isPrivate {Boolean}  true if the request belongs to a private browsing window
-   * @return {Object} An object containing properties block, collapse and hits
+   * @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 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 186 matching lines @@
 function getSitekey(frames)
 {
   for (let frame of frames)
   {
     if (frame.sitekey && frame.sitekey.indexOf("_") >= 0)
     {
       let [key, signature] = frame.sitekey.split("_", 2);
       key = key.replace(/=/g, "");
 
       // Website specifies a key but is the signature valid?
-      let uri = Services.io.newURI(getWindowLocation(wnd), null, null);
+      let uri = Services.io.newURI(frame.location, null, null);
       let host = uri.asciiHost;
       if (uri.port > 0)
         host += ":" + uri.port;
       let params = [
         uri.path.replace(/#.*/, ""),  // REQUEST_URI
         host,                         // HTTP_HOST
         Utils.httpProtocol.userAgent  // HTTP_USER_AGENT
       ];
       if (Utils.verifySignature(key, signature, params.join("\0")))
         return [key, frame];
@@ skipping 79 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);
 }