Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: webrequest.js

Issue 5138680696012800: Issue 616 - Enforce $generichide and $genericblock in Chrome (Closed)
Patch Set: Updated adblockplustests dependency Created Oct. 5, 2015, 9:52 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « popupBlocker.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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);
« no previous file with comments | « popupBlocker.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld