| OLD | NEW | 
|---|
| 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 if (require("info").platform == "chromium" && "webNavigation" in chrome) | 18 if (require("info").platform == "chromium" && "webNavigation" in chrome) | 
| 19 { | 19 { | 
| 20   var tabsLoading = {}; | 20   var tabsLoading = {}; | 
| 21 | 21 | 
| 22   chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) | 22   chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) | 
| 23   { | 23   { | 
| 24     var sourceTab = new Tab({id: details.sourceTabId}); | 24     var sourcePage = new ext.Page({id: details.sourceTabId}); | 
| 25     var sourceFrame = new Frame({id: details.sourceFrameId, tab: sourceTab}); | 25     var sourceFrame = new ext.Frame({frameId: details.sourceFrameId, tabId: deta
    ils.sourceTabId}); | 
| 26 | 26 | 
| 27     if (isFrameWhitelisted(sourceTab, sourceFrame)) | 27     if (isFrameWhitelisted(sourcePage, sourceFrame)) | 
| 28       return; | 28       return; | 
| 29 | 29 | 
| 30     var openerUrl = sourceFrame.url; | 30     var openerUrl = sourceFrame.url; | 
| 31     if (!openerUrl) | 31     if (!openerUrl) | 
| 32     { | 32     { | 
| 33       // We don't know the opener tab | 33       // We don't know the opener tab | 
| 34       return; | 34       return; | 
| 35     } | 35     } | 
| 36     tabsLoading[details.tabId] = openerUrl; | 36     tabsLoading[details.tabId] = openerUrl; | 
| 37 | 37 | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 56 | 56 | 
| 57 function checkPotentialPopup(tabId, url, opener) | 57 function checkPotentialPopup(tabId, url, opener) | 
| 58 { | 58 { | 
| 59   var requestHost = extractHostFromURL(url); | 59   var requestHost = extractHostFromURL(url); | 
| 60   var documentHost = extractHostFromURL(opener); | 60   var documentHost = extractHostFromURL(opener); | 
| 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   var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document
    Host, thirdParty); | 
| 63   if (filter instanceof BlockingFilter) | 63   if (filter instanceof BlockingFilter) | 
| 64     chrome.tabs.remove(tabId); | 64     chrome.tabs.remove(tabId); | 
| 65 } | 65 } | 
| OLD | NEW | 
|---|