Issue 6402 - Split filter hit / request logging out into own API

lib/popupBlocker.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
@@ skipping 26 matching lines @@
     browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged);
     browser.webNavigation.onCommitted.removeListener(onPopupURLChanged);
     browser.webNavigation.onCompleted.removeListener(onCompleted);
     browser.tabs.onRemoved.removeListener(forgetPopup);
   }
 }
 
 function checkPotentialPopup(tabId, popup)
 {
   let url = popup.url || "about:blank";
-  let docDomain = extractHostFromFrame(popup.sourceFrame);

[Manish Jethani, 2018/05/09 15:11:11]

Let's keep it documentHost here?

[kzar, 2018/05/09 17:58:42]

Done.

-  let thirdParty = isThirdParty(new URL(url), docDomain);
+  let documentHost = extractHostFromFrame(popup.sourceFrame);
+  let thirdParty = isThirdParty(new URL(url), documentHost);
 
   let specificOnly = !!checkWhitelisted(
     popup.sourcePage, popup.sourceFrame, null,
     RegExpFilter.typeMap.GENERICBLOCK
   );
 
   let filter = defaultMatcher.matchesAny(
     url, RegExpFilter.typeMap.POPUP,
-    docDomain, thirdParty, null, specificOnly
+    documentHost, thirdParty, null, specificOnly
   );
 
   if (filter instanceof BlockingFilter)
     browser.tabs.remove(tabId);
 
   logRequest(
     [popup.sourcePage.id],
-    {url, type: "POPUP", docDomain, thirdParty, specificOnly},
+    {url, type: "POPUP", docDomain: documentHost, thirdParty, specificOnly},
     filter
   );
 }
 
 function onPopupURLChanged(details)
 {
   // Ignore frames inside the popup window.
   if (details.frameId != 0)
     return;
 
@@ skipping 47 matching lines @@
     {
       forgetPopup(details.tabId);
     }
     else
     {
       popup.sourceFrame = frame;
       checkPotentialPopup(details.tabId, popup);
     }
   });
 }