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

Delta Between Two Patch Sets: popupBlocker.js

Issue 6393086494113792: Issue 154 - Added devtools panel showing blocked and blockable items (Closed)
Left Patch Set: Moved UI to adblockplusui repo Created Jan. 7, 2015, 1:46 p.m.
Right Patch Set: Adapt for UI changes generating domain specific filters when necessary Created Feb. 3, 2016, 10:40 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « popup.js ('k') | webrequest.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2016 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
20 if (require("info").platform == "chromium") 18 if (require("info").platform == "chromium")
21 { 19 {
20 var logRequest = require("devtools").logRequest;
22 var tabsLoading = {}; 21 var tabsLoading = {};
23 22
24 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) 23 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
25 { 24 {
26 var sourcePage = new ext.Page({id: details.sourceTabId}); 25 var sourcePage = new ext.Page({id: details.sourceTabId});
27 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId); 26 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
28 27
29 if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame)) 28 if (checkWhitelisted(sourcePage, sourceFrame))
30 return; 29 return;
31 30
32 var openerUrl = sourceFrame.url; 31 var documentHost = extractHostFromFrame(sourceFrame);
33 if (!openerUrl) 32 if (!documentHost)
34 {
35 // We don't know the opener tab
36 return; 33 return;
37 }
38 tabsLoading[details.tabId] = {tabId: details.sourceTabId, url: openerUrl};
39 34
40 checkPotentialPopup(details.tabId, details.url, details.sourceTabId, openerU rl); 35 var specificOnly = !!checkWhitelisted(sourcePage, sourceFrame,
36 RegExpFilter.typeMap.GENERICBLOCK);
37
38 tabsLoading[details.tabId] = {
39 page: sourcePage,
40 documentHost: documentHost,
41 specificOnly: specificOnly
42 };
43 checkPotentialPopup(details.tabId, details.url, sourcePage, documentHost, sp ecificOnly);
41 }); 44 });
42 45
43 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) 46 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
44 { 47 {
45 var opener = tabsLoading[tabId]; 48 if (!(tabId in tabsLoading))
46 if (!opener) 49 {
50 // Not a pop-up we've previously seen
47 return; 51 return;
52 }
48 53
49 if ("url" in changeInfo) 54 if ("url" in changeInfo)
50 checkPotentialPopup(tabId, tab.url, opener.tabId, opener.url); 55 {
56 var source = tabsLoading[tabId];
57 checkPotentialPopup(tabId, tab.url, source.page,
58 source.documentHost,
59 source.specificOnly);
60 }
51 61
52 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank") 62 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
53 delete tabsLoading[tabId]; 63 delete tabsLoading[tabId];
54 }); 64 });
55 } 65 }
56 66
57 function checkPotentialPopup(tabId, url, openerTabId, openerUrl) 67 function checkPotentialPopup(tabId, url, sourcePage, documentHost, specificOnly)
58 { 68 {
59 var requestHost = extractHostFromURL(url); 69 var urlObj = new URL(url || "about:blank");
60 var documentHost = extractHostFromURL(openerUrl); 70 var urlString = stringifyURL(urlObj);
61 var thirdParty = isThirdParty(requestHost, documentHost); 71 var thirdParty = isThirdParty(urlObj, documentHost);
62 72
63 if (!url) 73 var filter = defaultMatcher.matchesAny(
64 url = "about:blank"; 74 urlString, RegExpFilter.typeMap.POPUP,
75 documentHost, thirdParty, null, specificOnly
76 );
65 77
66 var filter = defaultMatcher.matchesAny(url, "POPUP", documentHost, thirdParty) ;
67 if (filter instanceof BlockingFilter) 78 if (filter instanceof BlockingFilter)
68 chrome.tabs.remove(tabId); 79 chrome.tabs.remove(tabId);
69 80
70 logRequest(openerTabId, url, "POPUP", documentHost, null, filter); 81 logRequest(
82 sourcePage, urlString, "POPUP", documentHost,
83 thirdParty, null, specificOnly, filter
84 );
71 } 85 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld