Issue 7054 - Update the adblockpluscore dependency to 5cb695da5a40, adblockplusui to f86abf2efdfd

lib/filterComposer.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 73 matching lines @@
   {
     let typeMask = RegExpFilter.typeMap[details.type];
     let docDomain = extractHostFromFrame(frame);
     let specificOnly = checkWhitelisted(page, frame, null,
                                         RegExpFilter.typeMap.GENERICBLOCK);
 
     // Add a blocking filter for each URL of the element that can be blocked
     for (let url of details.urls)
     {
       let urlObj = new URL(url, details.baseURL);
-      let filter = defaultMatcher.matchesAny(

[Manish Jethani, 2018/12/18 17:12:16]

We need to use the new `isWhitelisted` function here.

  defaultMatcher.isWhitelisted(...)

Same parameters.

Note: it doesn't return a filter, it returns true or false. Please rename
`filter` to `whitelisted`.

[Jon Sonesen, 2018/12/19 10:05:21]

Done.

[kzar, 2018/12/19 10:16:52]

Nit: I have to agree with Manish, `whitelisted` or `isWhitelisted` or similar
would be a better name for the variable than `hasFilter`.

+      let whitelisted = defaultMatcher.isWhitelisted(
         urlObj.href, typeMask, docDomain,
         isThirdParty(urlObj, docDomain),
         getKey(page, frame), specificOnly
       );
 
-      if (!filter)
+      if (!whitelisted)
       {
         let filterText = urlObj.href.replace(/^[\w-]+:\/+(?:www\.)?/, "||");
 
         if (specificOnly)
           filterText += "$domain=" + docDomain;
 
         if (!filters.includes(filterText))
           filters.push(filterText);
       }
     }
@@ skipping 253 matching lines @@
 port.on("composer.isPageReady", (message, sender) =>
 {
   return readyActivePages.has(new ext.Page({id: message.pageId}));
 });
 
 port.on("composer.ready", (message, sender) =>
 {
   readyActivePages.set(sender.page, !checkWhitelisted(sender.page));
   updateContextMenu(sender.page);
 });