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

Side by Side Diff: webrequest.js

Issue 5138680696012800: Issue 616 - Enforce $generichide and $genericblock in Chrome (Closed)
Patch Set: Rebased onto typeMask changes Created July 14, 2015, 4:54 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « popupBlocker.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page); 58 FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
59 } 59 }
60 60
61 function onBeforeRequest(url, type, page, frame) 61 function onBeforeRequest(url, type, page, frame)
62 { 62 {
63 if (isFrameWhitelisted(page, frame)) 63 if (isFrameWhitelisted(page, frame))
64 return true; 64 return true;
65 65
66 var docDomain = extractHostFromFrame(frame); 66 var docDomain = extractHostFromFrame(frame);
67 var key = getKey(page, frame); 67 var key = getKey(page, frame);
68 var specificOnly = isFrameWhitelisted(page, frame, RegExpFilter.typeMap.GENERI CBLOCK);
68 var filter = defaultMatcher.matchesAny( 69 var filter = defaultMatcher.matchesAny(
69 stringifyURL(url), 70 stringifyURL(url),
70 RegExpFilter.typeMap[type], docDomain, 71 RegExpFilter.typeMap[type], docDomain,
71 isThirdParty(url, docDomain), 72 isThirdParty(url, docDomain),
72 key 73 key,
74 specificOnly
73 ); 75 );
74 76
75 setTimeout(onBeforeRequestAsync, 0, url, type, page, filter); 77 setTimeout(onBeforeRequestAsync, 0, url, type, page, filter);
76 78
77 return !(filter instanceof BlockingFilter); 79 return !(filter instanceof BlockingFilter);
78 } 80 }
79 81
80 ext.webRequest.onBeforeRequest.addListener(onBeforeRequest); 82 ext.webRequest.onBeforeRequest.addListener(onBeforeRequest);
81 83
82 if (platform == "chromium") 84 if (platform == "chromium")
(...skipping 18 matching lines...) Expand all
101 103
102 chrome.webRequest.onHeadersReceived.addListener( 104 chrome.webRequest.onHeadersReceived.addListener(
103 onHeadersReceived, 105 onHeadersReceived,
104 { 106 {
105 urls: ["http://*/*", "https://*/*"], 107 urls: ["http://*/*", "https://*/*"],
106 types: ["main_frame", "sub_frame"] 108 types: ["main_frame", "sub_frame"]
107 }, 109 },
108 ["responseHeaders"] 110 ["responseHeaders"]
109 ); 111 );
110 } 112 }
OLDNEW
« no previous file with comments | « popupBlocker.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld