Unified Diff: lib/filterComposer.js
Issue 29739594:
Issue 6543 - Match requests without tabId/frameId in their originating context (Closed)
Patch Set: Use URL patterns to find tabs for initiator
Created April 4, 2018, 1:01 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« lib/cssInjection.js ('k')
|
lib/popupBlocker.js » ('j')
|
lib/requestBlocker.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/filterComposer.js |
| =================================================================== |
| --- a/lib/filterComposer.js |
| +++ b/lib/filterComposer.js |
| @@ -97,7 +97,7 @@ |
| { |
| let typeMask = RegExpFilter.typeMap[details.type]; |
| let docDomain = extractHostFromFrame(frame); |
| - let specificOnly = checkWhitelisted(page, frame, |
| + let specificOnly = checkWhitelisted(page, frame, null, |
| RegExpFilter.typeMap.GENERICBLOCK); |
| // Add a blocking filter for each URL of the element that can be blocked |
| @@ -125,7 +125,7 @@ |
| } |
| // If we couldn't generate any blocking filters, fallback to element hiding |
| - if (filters.length == 0 && !checkWhitelisted(page, frame, |
| + if (filters.length == 0 && !checkWhitelisted(page, frame, null, |
| RegExpFilter.typeMap.ELEMHIDE)) |
| { |
| // Generate CSS selectors based on the element's "id" and |
« no previous file with comments
|
« lib/cssInjection.js ('k')
|
lib/popupBlocker.js » ('j')
|
lib/requestBlocker.js » ('J')
