Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702

lib/devtools.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 65 matching lines @@
   return panel.records.some(record =>
     record.request.url == request.url &&
     record.request.docDomain == request.docDomain &&
 
     // Ignore partial (e.g. ELEMHIDE) whitelisting if there is already
     // a DOCUMENT exception which disables all means of blocking.
     (record.request.type == "DOCUMENT" ?
        nonRequestTypes.includes(request.type) :
        record.request.type == request.type) &&
 
-    // Matched element hiding and CSP filters don't relate to a particular
-    // request, so we have to compare the selector or the CSP value in order to
-    // avoid duplicates.

[Sebastian Noack, 2019/01/30 19:54:25]

This comment is misleading. $csp filter relate to a request, but the relation is
1-to-n (instead of 1-to-1) now.

+    // Matched element hiding filters don't relate to a particular request,
+    // so we have to compare the selector in order to avoid duplicates.
     (record.filter && record.filter.selector) == (filter && filter.selector) &&
-    (record.filter && record.filter.csp) == (filter && filter.csp)
+
+    // We apply multiple CSP filters to a document, but we must still remove
+    // any duplicates. Two CSP filters are duplicates if both have identical
+    // text.
+    (record.filter && record.filter.csp && record.filter.text) ==
+    (filter && filter.csp && filter.text)
   );
 }
 
 function addRecord(panel, request, filter)
 {
   if (!hasRecord(panel, request, filter))
   {
     panel.port.postMessage({
       type: "add-record",
       request,
@@ skipping 176 matching lines @@
       ext.pages.onLoading.removeListener(onLoading);
       filterNotifier.off("filter.added", onFilterAdded);
       filterNotifier.off("filter.removed", onFilterRemoved);
       filterNotifier.off("subscription.added", onSubscriptionAdded);
     }
   });
 
   HitLogger.addListener(inspectedTabId, hitListener);
   panels.set(inspectedTabId, panel);
 });