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

Side by Side Diff: webrequest.js

Issue 5644946291818496: Issue 433 - Made adjustments for $sitekey-related changes to the Matcher API (Closed)
Patch Set: Created Sept. 10, 2014, 3:38 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
« lib/whitelisting.js ('K') | « lib/whitelisting.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 <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000); 46 onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000);
47 } 47 }
48 }); 48 });
49 49
50 function onBeforeRequest(url, type, page, frame) 50 function onBeforeRequest(url, type, page, frame)
51 { 51 {
52 if (isFrameWhitelisted(page, frame)) 52 if (isFrameWhitelisted(page, frame))
53 return true; 53 return true;
54 54
55 var docDomain = extractHostFromFrame(frame); 55 var docDomain = extractHostFromFrame(frame);
56 var key = getKey(page, frame);
56 var filter = defaultMatcher.matchesAny( 57 var filter = defaultMatcher.matchesAny(
57 url, 58 url,
58 type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(), 59 type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
59 docDomain, 60 docDomain,
60 isThirdParty(extractHostFromURL(url), docDomain) 61 isThirdParty(extractHostFromURL(url), docDomain),
62 key
61 ); 63 );
62 64
63 // We can't listen to onHeadersReceived in Safari so we need to 65 // We can't listen to onHeadersReceived in Safari so we need to
64 // check for notifications here 66 // check for notifications here
65 if (platform != "chromium" && type == "sub_frame") 67 if (platform != "chromium" && type == "sub_frame")
66 { 68 {
67 var notificationToShow = Notification.getNextToShow(url); 69 var notificationToShow = Notification.getNextToShow(url);
68 if (notificationToShow) 70 if (notificationToShow)
69 showNotification(notificationToShow); 71 showNotification(notificationToShow);
70 } 72 }
(...skipping 17 matching lines...) Expand all
88 var page = new ext.Page({id: details.tabId}); 90 var page = new ext.Page({id: details.tabId});
89 var frame = ext.getFrame(details.tabId, details.frameId); 91 var frame = ext.getFrame(details.tabId, details.frameId);
90 92
91 if (!frame || frame.url != details.url) 93 if (!frame || frame.url != details.url)
92 return; 94 return;
93 95
94 for (var i = 0; i < details.responseHeaders.length; i++) 96 for (var i = 0; i < details.responseHeaders.length; i++)
95 { 97 {
96 var header = details.responseHeaders[i]; 98 var header = details.responseHeaders[i];
97 if (header.name.toLowerCase() == "x-adblock-key" && header.value) 99 if (header.name.toLowerCase() == "x-adblock-key" && header.value)
98 processKeyException(header.value, page, frame); 100 processKey(header.value, page, frame);
99 } 101 }
100 102
101 var notificationToShow = Notification.getNextToShow(details.url); 103 var notificationToShow = Notification.getNextToShow(details.url);
102 if (notificationToShow) 104 if (notificationToShow)
103 showNotification(notificationToShow); 105 showNotification(notificationToShow);
104 } 106 }
105 107
106 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["ht tp://*/*", "https://*/*"]}, ["responseHeaders"]); 108 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["ht tp://*/*", "https://*/*"]}, ["responseHeaders"]);
107 } 109 }
OLDNEW
« lib/whitelisting.js ('K') | « lib/whitelisting.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld