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

lib/filterComposer.js

Index: lib/filterComposer.js
===================================================================
--- a/lib/filterComposer.js
+++ b/lib/filterComposer.js
@@ -86,17 +86,17 @@
     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.whitelist.matchesAny(
+      let filter = defaultMatcher.matchesAny(

[kzar, 2018/12/07 10:12:53]

Previously we generated a filter if a whitelisting filter wasn't found, but now
we only generate one if a blacklisting or whitelisting filter wasn't found. Do I
misunderstand?

[Manish Jethani, 2018/12/07 10:53:04]

You're right, this would change the behavior. Whether it should be changed is a
separate question, but let's not do it in this dependency update. We can file a
separate issue for it. Either we make another change to core to support this use
case or we change the behavior.

For now, I think we could just continue accessing the "private" _whitelist
property (as suggested in the integration notes [1])

[1]: https://issues.adblockplus.org/ticket/6940#Integrationnotes

[Sebastian Noack, 2018/12/08 00:52:26]

We have the same problem in lib/whitelisting.js. Using _whitelist for this
dependency update, sounds good enough to me.

[Manish Jethani, 2018/12/08 06:50:14]

No, it should not be a problem in lib/whitelisting.js, because in that case the
types are $document, $genericblock, $generichide, and $elemhide, all of which
should return a whitelist filter even if no blocking filter exists [1]

This change in core was made in fact keeping lib/whitelisting.js in mind. Now if
we use `defaultMatcher` directly instead of `defaultMatcher._whitelist`, we get
the benefit of caching as well.

[1]:
https://github.com/adblockplus/adblockpluscore/blob/5e45ca01856f981f4c99e4945...

[Manish Jethani, 2018/12/09 11:59:34]

FYI https://issues.adblockplus.org/ticket/7162

[Jon Sonesen, 2018/12/09 15:52:09]

Acknowledged.

         urlObj.href, typeMask, docDomain,
         isThirdParty(urlObj, docDomain),
         getKey(page, frame), specificOnly
       );
 
       if (!filter)
       {
         let filterText = urlObj.href.replace(/^[\w-]+:\/+(?:www\.)?/, "||");