Issue 4580 - Make filter/request logging use plain tabIds, prepare for multi-tab requests

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module whitelisting */
 
 "use strict";
 
 const {defaultMatcher} = require("matcher");
 const {Filter, RegExpFilter} = require("filterClasses");
 const {FilterNotifier} = require("filterNotifier");
 const {FilterStorage} = require("filterStorage");
 const {stringifyURL, getDecodedHostname,
        extractHostFromFrame, isThirdParty} = require("url");
 const {port} = require("messaging");
-const devtools = require("devtools");
+const {logWhitelistedDocument} = require("devtools");
 const {verifySignature} = require("rsa");
 
 let sitekeys = new ext.PageMap();
 
 function match(page, url, typeMask, docDomain, sitekey)
 {
   let thirdParty = !!docDomain && isThirdParty(url, docDomain);
   let urlString = stringifyURL(url);
 
   if (!docDomain)
     docDomain = getDecodedHostname(url);
 
   let filter = defaultMatcher.whitelist.matchesAny(
     urlString, typeMask, docDomain, thirdParty, sitekey
   );
 
-  if (filter && devtools)
-  {
-    devtools.logWhitelistedDocument(
-      page, urlString, typeMask, docDomain, filter
-    );
-  }
+  if (filter)
+    logWhitelistedDocument(page.id, urlString, typeMask, docDomain, filter);
 
   return filter;
 }
 
 let checkWhitelisted =
 /**
  * Gets the active whitelisting filter for the document associated
  * with the given page/frame, or null if it's not whitelisted.
  *
  * @param {Page}   page
@@ skipping 163 matching lines @@
 {
   browser.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }