| 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-2015 Eyeo GmbH | 3  * Copyright (C) 2006-2015 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 documentHost = extractHostFromFrame(sourceFrame); | 32     var documentHost = extractHostFromFrame(sourceFrame); | 
| 31     if (!documentHost) | 33     if (!documentHost) | 
| 32       return; | 34       return; | 
| 33 | 35 | 
| 34     tabsLoading[details.tabId] = documentHost; | 36     tabsLoading[details.tabId] = {page: sourcePage, host: documentHost}; | 
| 35     checkPotentialPopup(details.tabId, details.url, documentHost); | 37     checkPotentialPopup(details.tabId, details.url, sourcePage, documentHost); | 
| 36   }); | 38   }); | 
| 37 | 39 | 
| 38   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) | 40   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) | 
| 39   { | 41   { | 
| 40     if (!(tabId in tabsLoading)) | 42     var opener = tabsLoading[tabId]; | 
| 41     { | 43     if (!opener) | 
| 42       // Not a pop-up we've previously seen |  | 
| 43       return; | 44       return; | 
| 44     } |  | 
| 45 | 45 | 
| 46     if ("url" in changeInfo) | 46     if ("url" in changeInfo) | 
| 47       checkPotentialPopup(tabId, tab.url, tabsLoading[tabId]); | 47       checkPotentialPopup(tabId, tab.url, opener.page, opener.host); | 
| 48 | 48 | 
| 49     if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != 
    "about:blank") | 49     if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != 
    "about:blank") | 
| 50       delete tabsLoading[tabId]; | 50       delete tabsLoading[tabId]; | 
| 51   }); | 51   }); | 
| 52 } | 52 } | 
| 53 | 53 | 
| 54 function checkPotentialPopup(tabId, url, documentHost) | 54 function checkPotentialPopup(tabId, url, sourcePage, documentHost) | 
| 55 { | 55 { | 
| 56   url = new URL(url || "about:blank"); | 56   url = new URL(url || "about:blank"); | 
| 57 | 57 | 
| 58   var filter = defaultMatcher.matchesAny( | 58   var filter = defaultMatcher.matchesAny( | 
| 59     stringifyURL(url), "POPUP", | 59     stringifyURL(url), "POPUP", | 
| 60     documentHost, isThirdParty(url, documentHost) | 60     documentHost, isThirdParty(url, documentHost) | 
| 61   ); | 61   ); | 
| 62 | 62 | 
| 63   if (filter instanceof BlockingFilter) | 63   if (filter instanceof BlockingFilter) | 
| 64     chrome.tabs.remove(tabId); | 64     chrome.tabs.remove(tabId); | 
|  | 65 | 
|  | 66   logRequest(sourcePage, url, "POPUP",  documentHost, null, filter); | 
| 65 } | 67 } | 
| OLD | NEW | 
|---|