LEFT | RIGHT |
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 logRequest = require("devtools").logRequest; |
21 var tabsLoading = {}; | 21 var tabsLoading = {}; |
22 | 22 |
23 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) | 23 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) |
24 { | 24 { |
25 var sourcePage = new ext.Page({id: details.sourceTabId}); | 25 var sourcePage = new ext.Page({id: details.sourceTabId}); |
26 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId); | 26 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId); |
27 | 27 |
28 if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame)) | 28 if (checkWhitelisted(sourcePage, sourceFrame)) |
29 return; | 29 return; |
30 | 30 |
31 var documentHost = extractHostFromFrame(sourceFrame); | 31 var documentHost = extractHostFromFrame(sourceFrame); |
32 if (!documentHost) | 32 if (!documentHost) |
33 return; | 33 return; |
34 | 34 |
35 var specificOnly = isFrameWhitelisted(sourcePage, sourceFrame, | 35 var specificOnly = !!checkWhitelisted(sourcePage, sourceFrame, |
36 RegExpFilter.typeMap.GENERICBLOCK); | 36 RegExpFilter.typeMap.GENERICBLOCK); |
37 | 37 |
38 tabsLoading[details.tabId] = { | 38 tabsLoading[details.tabId] = { |
39 page: sourcePage, | 39 page: sourcePage, |
40 documentHost: documentHost, | 40 documentHost: documentHost, |
41 specificOnly: specificOnly | 41 specificOnly: specificOnly |
42 }; | 42 }; |
43 checkPotentialPopup(details.tabId, details.url, sourcePage, documentHost, sp
ecificOnly); | 43 checkPotentialPopup(details.tabId, details.url, sourcePage, documentHost, sp
ecificOnly); |
44 }); | 44 }); |
45 | 45 |
(...skipping 25 matching lines...) Expand all Loading... |
71 var thirdParty = isThirdParty(urlObj, documentHost); | 71 var thirdParty = isThirdParty(urlObj, documentHost); |
72 | 72 |
73 var filter = defaultMatcher.matchesAny( | 73 var filter = defaultMatcher.matchesAny( |
74 urlString, RegExpFilter.typeMap.POPUP, | 74 urlString, RegExpFilter.typeMap.POPUP, |
75 documentHost, thirdParty, null, specificOnly | 75 documentHost, thirdParty, null, specificOnly |
76 ); | 76 ); |
77 | 77 |
78 if (filter instanceof BlockingFilter) | 78 if (filter instanceof BlockingFilter) |
79 chrome.tabs.remove(tabId); | 79 chrome.tabs.remove(tabId); |
80 | 80 |
81 logRequest(sourcePage, urlString, "POPUP", documentHost, thirdParty, null, fi
lter); | 81 logRequest( |
| 82 sourcePage, urlString, "POPUP", documentHost, |
| 83 thirdParty, null, specificOnly, filter |
| 84 ); |
82 } | 85 } |
LEFT | RIGHT |