Unified Diff: webrequest.js
Issue 5138680696012800:
Issue 616 - Enforce $generichide and $genericblock in Chrome (Closed)
Patch Set: Obey 80 character line limit
Created Aug. 26, 2015, 10:20 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« popupBlocker.js ('K')
|
« popupBlocker.js ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: webrequest.js |
| diff --git a/webrequest.js b/webrequest.js |
| index e8ecd640bcddf12318831ef72c05727ca7e02f58..55668bdd6ef490edd4183672ff455bb343d9bff3 100644 |
| --- a/webrequest.js |
| +++ b/webrequest.js |
| @@ -65,11 +65,14 @@ function onBeforeRequest(url, type, page, frame) |
| var docDomain = extractHostFromFrame(frame); |
| var key = getKey(page, frame); |
| + var specificOnly = isFrameWhitelisted(page, frame, |
| + RegExpFilter.typeMap.GENERICBLOCK); |
| var filter = defaultMatcher.matchesAny( |
| stringifyURL(url), |
| RegExpFilter.typeMap[type], docDomain, |
| isThirdParty(url, docDomain), |
| - key |
| + key, |
| + specificOnly |
| ); |
| setTimeout(onBeforeRequestAsync, 0, url, type, page, filter); |
