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

Side by Side Diff: webrequest.js

Issue 8691076: Make sure to indicate to Chrome when our filters change (Closed)
Patch Set: Created Oct. 30, 2012, 10:40 a.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 | « no previous file | 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 the Adblock Plus extension, 2 * This file is part of the Adblock Plus extension,
3 * Copyright (C) 2006-2012 Eyeo GmbH 3 * Copyright (C) 2006-2012 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://* /*", "https://*/*"]}, ["blocking"]); 18 chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://* /*", "https://*/*"]}, ["blocking"]);
19 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http ://*/*", "https://*/*"]}, ["responseHeaders"]); 19 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http ://*/*", "https://*/*"]}, ["responseHeaders"]);
20 chrome.tabs.onRemoved.addListener(forgetTab); 20 chrome.tabs.onRemoved.addListener(forgetTab);
21 21
22 var onFilterChangeTimeout = null;
23 function onFilterChange()
24 {
25 onFilterChangeTimeout = null;
26 chrome.webRequest.handlerBehaviorChanged();
27 }
28
29 var importantNotifications = {
30 'filter.added': true,
31 'filter.removed': true,
32 'filter.disabled': true,
33 'subscription.added': true,
34 'subscription.removed': true,
35 'subscription.disabled': true,
36 'subscription.updated': true,
37 'load': true
38 };
39
40 require("filterNotifier").FilterNotifier.addListener(function(action)
41 {
42 if (action in importantNotifications)
43 {
44 // Execute delayed to prevent multiple executions in a quick succession
45 if (onFilterChangeTimeout != null)
46 window.clearTimeout(onFilterChangeTimeout);
47 onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000);
48 }
49 });
50
22 var frames = {}; 51 var frames = {};
23 52
24 function onBeforeRequest(details) 53 function onBeforeRequest(details)
25 { 54 {
26 if (details.tabId == -1) 55 if (details.tabId == -1)
27 return {}; 56 return {};
28 57
29 var type = details.type; 58 var type = details.type;
30 if (type == "main_frame" || type == "sub_frame") 59 if (type == "main_frame" || type == "sub_frame")
31 recordFrame(details.tabId, details.frameId, details.parentFrameId, details.u rl); 60 recordFrame(details.tabId, details.frameId, details.parentFrameId, details.u rl);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 { 199 {
171 var parentUrl = getFrameUrl(tabId, parent); 200 var parentUrl = getFrameUrl(tabId, parent);
172 if (parentUrl && isWhitelisted(parentUrl, type)) 201 if (parentUrl && isWhitelisted(parentUrl, type))
173 return true; 202 return true;
174 if (parentUrl && "keyException" in frames[tabId][frameId]) 203 if (parentUrl && "keyException" in frames[tabId][frameId])
175 return true; 204 return true;
176 parent = getFrameParent(tabId, parent); 205 parent = getFrameParent(tabId, parent);
177 } 206 }
178 return false; 207 return false;
179 } 208 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld