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

Side by Side Diff: popupBlocker.js

Issue 6393086494113792: Issue 154 - Added devtools panel showing blocked and blockable items (Closed)
Patch Set: Added some newlines for better legibility Created Jan. 5, 2015, 7:35 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 | « metadata.common ('k') | webrequest.js » ('j') | 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
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 var logRequest = require("devtools").logRequest;
19
18 if (require("info").platform == "chromium") 20 if (require("info").platform == "chromium")
19 { 21 {
20 var tabsLoading = {}; 22 var tabsLoading = {};
21 23
22 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) 24 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
23 { 25 {
24 var sourcePage = new ext.Page({id: details.sourceTabId}); 26 var sourcePage = new ext.Page({id: details.sourceTabId});
25 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId); 27 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
26 28
27 if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame)) 29 if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame))
28 return; 30 return;
29 31
30 var openerUrl = sourceFrame.url; 32 var openerUrl = sourceFrame.url;
31 if (!openerUrl) 33 if (!openerUrl)
32 { 34 {
33 // We don't know the opener tab 35 // We don't know the opener tab
34 return; 36 return;
35 } 37 }
36 tabsLoading[details.tabId] = openerUrl; 38 tabsLoading[details.tabId] = {tabId: details.sourceTabId, url: openerUrl};
37 39
38 checkPotentialPopup(details.tabId, details.url, openerUrl); 40 checkPotentialPopup(details.tabId, details.url, details.sourceTabId, openerU rl);
39 }); 41 });
40 42
41 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) 43 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
42 { 44 {
43 if (!(tabId in tabsLoading)) 45 var opener = tabsLoading[tabId];
44 { 46 if (!opener)
45 // Not a pop-up we've previously seen
46 return; 47 return;
47 }
48 48
49 if ("url" in changeInfo) 49 if ("url" in changeInfo)
50 checkPotentialPopup(tabId, tab.url, tabsLoading[tabId]); 50 checkPotentialPopup(tabId, tab.url, opener.tabId, opener.url);
51 51
52 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank") 52 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
53 delete tabsLoading[tabId]; 53 delete tabsLoading[tabId];
54 }); 54 });
55 } 55 }
56 56
57 function checkPotentialPopup(tabId, url, opener) 57 function checkPotentialPopup(tabId, url, openerTabId, openerUrl)
58 { 58 {
59 var requestHost = extractHostFromURL(url); 59 var requestHost = extractHostFromURL(url);
60 var documentHost = extractHostFromURL(opener); 60 var documentHost = extractHostFromURL(openerUrl);
61 var thirdParty = isThirdParty(requestHost, documentHost); 61 var thirdParty = isThirdParty(requestHost, documentHost);
62 var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document Host, thirdParty); 62
63 if (!url)
64 url = "about:blank";
65
66 var filter = defaultMatcher.matchesAny(url, "POPUP", documentHost, thirdParty) ;
63 if (filter instanceof BlockingFilter) 67 if (filter instanceof BlockingFilter)
64 chrome.tabs.remove(tabId); 68 chrome.tabs.remove(tabId);
69
70 logRequest(openerTabId, url, "POPUP", documentHost, null, filter);
65 } 71 }
OLDNEW
« no previous file with comments | « metadata.common ('k') | webrequest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld