OLD | NEW |
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-2016 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 if (require("info").platform == "chromium") | 18 if (require("info").platform == "chromium") |
19 { | 19 { |
| 20 var logRequest = require("devtools").logRequest; |
20 var tabsLoading = {}; | 21 var tabsLoading = {}; |
21 | 22 |
22 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) | 23 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) |
23 { | 24 { |
24 var sourcePage = new ext.Page({id: details.sourceTabId}); | 25 var sourcePage = new ext.Page({id: details.sourceTabId}); |
25 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId); | 26 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId); |
26 | 27 |
27 if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame)) | 28 if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame)) |
28 return; | 29 return; |
29 | 30 |
30 var documentHost = extractHostFromFrame(sourceFrame); | 31 var documentHost = extractHostFromFrame(sourceFrame); |
31 if (!documentHost) | 32 if (!documentHost) |
32 return; | 33 return; |
33 | 34 |
34 var specificOnly = isFrameWhitelisted(sourcePage, sourceFrame, | 35 var specificOnly = isFrameWhitelisted(sourcePage, sourceFrame, |
35 RegExpFilter.typeMap.GENERICBLOCK); | 36 RegExpFilter.typeMap.GENERICBLOCK); |
36 | 37 |
37 tabsLoading[details.tabId] = { | 38 tabsLoading[details.tabId] = { |
| 39 page: sourcePage, |
38 documentHost: documentHost, | 40 documentHost: documentHost, |
39 specificOnly: specificOnly | 41 specificOnly: specificOnly |
40 }; | 42 }; |
41 checkPotentialPopup(details.tabId, details.url, documentHost, specificOnly); | 43 checkPotentialPopup(details.tabId, details.url, sourcePage, documentHost, sp
ecificOnly); |
42 }); | 44 }); |
43 | 45 |
44 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) | 46 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) |
45 { | 47 { |
46 if (!(tabId in tabsLoading)) | 48 if (!(tabId in tabsLoading)) |
47 { | 49 { |
48 // Not a pop-up we've previously seen | 50 // Not a pop-up we've previously seen |
49 return; | 51 return; |
50 } | 52 } |
51 | 53 |
52 if ("url" in changeInfo) | 54 if ("url" in changeInfo) |
53 { | 55 { |
54 var source = tabsLoading[tabId]; | 56 var source = tabsLoading[tabId]; |
55 checkPotentialPopup(tabId, tab.url, source.documentHost, | 57 checkPotentialPopup(tabId, tab.url, source.page, |
56 source.specificOnly); | 58 source.documentHost, |
| 59 source.specificOnly); |
57 } | 60 } |
58 | 61 |
59 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url !=
"about:blank") | 62 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url !=
"about:blank") |
60 delete tabsLoading[tabId]; | 63 delete tabsLoading[tabId]; |
61 }); | 64 }); |
62 } | 65 } |
63 | 66 |
64 function checkPotentialPopup(tabId, url, documentHost, specificOnly) | 67 function checkPotentialPopup(tabId, url, sourcePage, documentHost, specificOnly) |
65 { | 68 { |
66 url = new URL(url || "about:blank"); | 69 var urlObj = new URL(url || "about:blank"); |
| 70 var urlString = stringifyURL(urlObj); |
| 71 var thirdParty = isThirdParty(urlObj, documentHost); |
67 | 72 |
68 var filter = defaultMatcher.matchesAny( | 73 var filter = defaultMatcher.matchesAny( |
69 stringifyURL(url), RegExpFilter.typeMap.POPUP, | 74 urlString, RegExpFilter.typeMap.POPUP, |
70 documentHost, isThirdParty(url, documentHost), | 75 documentHost, thirdParty, null, specificOnly |
71 null, specificOnly | |
72 ); | 76 ); |
73 | 77 |
74 if (filter instanceof BlockingFilter) | 78 if (filter instanceof BlockingFilter) |
75 chrome.tabs.remove(tabId); | 79 chrome.tabs.remove(tabId); |
| 80 |
| 81 logRequest(sourcePage, urlString, "POPUP", documentHost, thirdParty, null, fi
lter); |
76 } | 82 } |
OLD | NEW |