Unified Diff: webrequest.js
Issue 5138680696012800:
Issue 616 - Enforce $generichide and $genericblock in Chrome (Closed)
Patch Set: Consider $genericblock when blocking popups.
Created March 12, 2015, 7:18 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« 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 51737c5ed23e4cd6700fca4cd096a59170751d88..27457079396bdc0a73346746946c02e9c9f029fe 100644 |
| --- a/webrequest.js |
| +++ b/webrequest.js |
| @@ -54,12 +54,14 @@ function onBeforeRequest(url, type, page, frame) |
| var docDomain = extractHostFromFrame(frame); |
| var key = getKey(page, frame); |
| + var specificOnly = isFrameWhitelisted(page, frame, "GENERICBLOCK"); |
| var filter = defaultMatcher.matchesAny( |
| stringifyURL(url), |
| type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(), |
| docDomain, |
| isThirdParty(url, docDomain), |
| - key |
| + key, |
| + specificOnly |
| ); |
| // We can't listen to onHeadersReceived in Safari so we need to |
« no previous file with comments
|
« popupBlocker.js ('k')
|
no next file »
|
no next file with comments »
