Issue 492 - Implemented popup blocking for Safari

popupBlocker.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (require("info").platform == "chromium")
+ext.pages.onPopup.addListener(function(page, opener)
 {
-  var tabsLoading = {};
+  if (isFrameWhitelisted(opener.page, opener.frame))
+    return;
 
-  chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
-  {
-    var sourcePage = new ext.Page({id: details.sourceTabId});
-    var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
+  var requestHost = extractHostFromURL(page.url);
+  var documentHost = extractHostFromURL(opener.frame.url);
+  var thirdParty = isThirdParty(requestHost, documentHost);
+  var filter = defaultMatcher.matchesAny(page.url, "POPUP", documentHost, thirdParty);
 
-    if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame))
-      return;
-
-    var openerUrl = sourceFrame.url;
-    if (!openerUrl)
-    {
-      // We don't know the opener tab
-      return;
-    }
-    tabsLoading[details.tabId] = openerUrl;
-
-    checkPotentialPopup(details.tabId, details.url, openerUrl);
-  });
-
-  chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
-  {
-    if (!(tabId in tabsLoading))
-    {
-      // Not a pop-up we've previously seen
-      return;
-    }
-
-    if ("url" in changeInfo)
-      checkPotentialPopup(tabId, tab.url, tabsLoading[tabId]);
-
-    if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
-      delete tabsLoading[tabId];
-  });
-}
-
-function checkPotentialPopup(tabId, url, opener)
-{
-  var requestHost = extractHostFromURL(url);
-  var documentHost = extractHostFromURL(opener);
-  var thirdParty = isThirdParty(requestHost, documentHost);
-  var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", documentHost, thirdParty);
   if (filter instanceof BlockingFilter)
-    chrome.tabs.remove(tabId);
-}
+    page.close();
+});